1.1 --- a/src/rndval.c	Mon Sep 26 18:25:18 2011 +0300
     1.2 +++ b/src/rndval.c	Tue Sep 27 07:42:32 2011 +0300
     1.3 @@ -3,11 +3,11 @@
     1.4  
     1.5  int psys_init_anm_rnd(struct psys_anm_rnd *r)
     1.6  {
     1.7 -	if(anm_init_track(&r->value) == -1) {
     1.8 +	if(psys_init_track(&r->value) == -1) {
     1.9  		return -1;
    1.10  	}
    1.11 -	if(anm_init_track(&r->range) == -1) {
    1.12 -		anm_destroy_track(&r->value);
    1.13 +	if(psys_init_track(&r->range) == -1) {
    1.14 +		psys_destroy_track(&r->value);
    1.15  		return -1;
    1.16  	}
    1.17  	return 0;
    1.18 @@ -15,17 +15,17 @@
    1.19  
    1.20  void psys_destroy_anm_rnd(struct psys_anm_rnd *r)
    1.21  {
    1.22 -	anm_destroy_track(&r->value);
    1.23 -	anm_destroy_track(&r->range);
    1.24 +	psys_destroy_track(&r->value);
    1.25 +	psys_destroy_track(&r->range);
    1.26  }
    1.27  
    1.28  int psys_init_anm_rnd3(struct psys_anm_rnd3 *r)
    1.29  {
    1.30 -	if(anm_init_track3(&r->value) == -1) {
    1.31 +	if(psys_init_track3(&r->value) == -1) {
    1.32  		return -1;
    1.33  	}
    1.34 -	if(anm_init_track3(&r->range) == -1) {
    1.35 -		anm_destroy_track3(&r->value);
    1.36 +	if(psys_init_track3(&r->range) == -1) {
    1.37 +		psys_destroy_track3(&r->value);
    1.38  		return -1;
    1.39  	}
    1.40  	return 0;
    1.41 @@ -33,8 +33,8 @@
    1.42  
    1.43  void psys_destroy_anm_rnd3(struct psys_anm_rnd3 *r)
    1.44  {
    1.45 -	anm_destroy_track3(&r->value);
    1.46 -	anm_destroy_track3(&r->range);
    1.47 +	psys_destroy_track3(&r->value);
    1.48 +	psys_destroy_track3(&r->range);
    1.49  }
    1.50  
    1.51  
    1.52 @@ -55,20 +55,26 @@
    1.53  
    1.54  float psys_eval_anm_rnd(struct psys_anm_rnd *r, anm_time_t tm)
    1.55  {
    1.56 -	if(r->cur_tm != tm) {
    1.57 -		r->cur.value = anm_get_value(&r->value, tm);
    1.58 -		r->cur.range = anm_get_value(&r->range, tm);
    1.59 -		r->cur_tm = tm;
    1.60 +	struct psys_rnd tmp;
    1.61 +	if(tm == ANM_TIME_INVAL) {
    1.62 +		tmp.value = psys_get_cur_value(&r->value);
    1.63 +		tmp.range = psys_get_cur_value(&r->range);
    1.64 +	} else {
    1.65 +		tmp.value = psys_get_value(&r->value, tm);
    1.66 +		tmp.range = psys_get_value(&r->range, tm);
    1.67  	}
    1.68 -	return psys_eval_rnd(&r->cur);
    1.69 +	return psys_eval_rnd(&tmp);
    1.70  }
    1.71  
    1.72  vec3_t psys_eval_anm_rnd3(struct psys_anm_rnd3 *r, anm_time_t tm)
    1.73  {
    1.74 -	if(r->cur_tm != tm) {
    1.75 -		r->cur.value = anm_get_value3(&r->value, tm);
    1.76 -		r->cur.range = anm_get_value3(&r->range, tm);
    1.77 -		r->cur_tm = tm;
    1.78 +	struct psys_rnd3 tmp;
    1.79 +	if(tm == ANM_TIME_INVAL) {
    1.80 +		tmp.value = psys_get_cur_value3(&r->value);
    1.81 +		tmp.range = psys_get_cur_value3(&r->range);
    1.82 +	} else {
    1.83 +		tmp.value = psys_get_value3(&r->value, tm);
    1.84 +		tmp.range = psys_get_value3(&r->range, tm);
    1.85  	}
    1.86 -	return psys_eval_rnd3(&r->cur);
    1.87 +	return psys_eval_rnd3(&tmp);
    1.88  }