From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 14 Jun 2011 13:49:19 +0000 (+0200)
Subject: Anims for ewheel
X-Git-Tag: xonotic-v0.5.0~199^2^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=71dabcb1290145887410eb901b3a3bac85ee56c2;p=xonotic%2Fxonotic-data.pk3dir.git

Anims for ewheel
---

diff --git a/qcsrc/server/tturrets/units/unit_ewheel.qc b/qcsrc/server/tturrets/units/unit_ewheel.qc
index 8a493668e..1658fa173 100644
--- a/qcsrc/server/tturrets/units/unit_ewheel.qc
+++ b/qcsrc/server/tturrets/units/unit_ewheel.qc
@@ -122,6 +122,8 @@ void ewheel_move_path()
 void  ewheel_move_enemy()
 {
 
+    float newframe;
+    
     self.steerto = steerlib_arrive(self.enemy.origin,self.target_range_optimal);
 
     //self.steerto = steerlib_standoff(self.enemy.origin,self.target_range_optimal);
@@ -132,36 +134,49 @@ void  ewheel_move_enemy()
     {
         if ( self.tur_head.spawnshieldtime < 1 )
         {
-            self.frame = ewheel_amin_fwd_fast;
+            newframe = ewheel_amin_fwd_fast;
             movelib_move_simple(v_forward, ewheel_speed_fast, 0.4);
         }
         else if (self.tur_head.spawnshieldtime < 2)
         {
 
-            self.frame = ewheel_amin_fwd_slow;
+            newframe = ewheel_amin_fwd_slow;
             movelib_move_simple(v_forward, ewheel_speed_slow, 0.4);
        }
         else
         {
-            self.frame = ewheel_amin_fwd_slow;
+            newframe = ewheel_amin_fwd_slow;
             movelib_move_simple(v_forward, ewheel_speed_slower, 0.4);
         }
     }
     else if (self.tur_dist_enemy < self.target_range_optimal * 0.5)
     {
-        self.frame = ewheel_amin_bck_slow;
+        newframe = ewheel_amin_bck_slow;
         movelib_move_simple(v_forward * -1, ewheel_speed_slow, 0.4);
     }
     else
     {
-        self.frame = ewheel_amin_stop;
+        newframe = ewheel_amin_stop;
         movelib_beak_simple(ewheel_speed_stop);
     }
+    
+    if(self.frame != newframe)
+    {
+        self.frame = newframe;
+        self.SendFlags |= TNSF_ANIM;
+        self.anim_start_time = time;
+    }
 }
 
 
 void ewheel_move_idle()
 {
+    if(self.frame != 0)
+    {
+        self.SendFlags |= TNSF_ANIM;
+        self.anim_start_time = time;
+    }
+
     self.frame = 0;
     if (vlen(self.velocity))
         movelib_beak_simple(ewheel_speed_stop);