[nexuiz-commits] r6355 - trunk/data/qcsrc/server/tturrets/units

[DONOTREPLY at icculus.org]

Author: tzork
Date: 2009-03-29 17:47:59 -0400 (Sun, 29 Mar 2009)
New Revision: 6355

Modified:
   trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
   trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
   trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
Log:
Fix warnings

Modified: trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc	2009-03-29 19:50:42 UTC (rev 6354)
+++ trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc	2009-03-29 21:47:59 UTC (rev 6355)
@@ -71,7 +71,6 @@
             return verb.verb_static_value;
 
         return VS_CALL_NO;
-        break;
 
     case VCM_DO:
         // Do we have a path?
@@ -127,8 +126,6 @@
         else
             return VS_CALL_YES_DONE;
 
-        break;
-
     case VCM_REMOVE:
 
         if (self.pathcurrent)
@@ -137,8 +134,6 @@
         self.pathcurrent = world;
 
         return VS_CALL_YES_DONE;
-
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -149,13 +144,11 @@
     switch (eval)
     {
     case VCM_EVAL:
-            if(self.enemy)
-                return verb.verb_static_value;
+        if (self.enemy)
+            return verb.verb_static_value;
 
         return VS_CALL_NO;
 
-        break;
-
     case VCM_DO:
 
         self.moveto  = self.enemy.origin;
@@ -201,12 +194,11 @@
     switch (eval)
     {
     case VCM_EVAL:
-            if(self.enemy)
-            if(self.health < 50)
+        if (self.enemy)
+            if (self.health < 50)
                 return verb.verb_static_value;
 
-            return VS_CALL_NO;
-        break;
+        return VS_CALL_NO;
 
     case VCM_DO:
         self.steerto = (steerlib_push(self.enemy.origin) * 0.7) + (steerlib_traceavoid_flat(0.3, 500, '0 0 128') * 0.3);
@@ -217,7 +209,6 @@
 
         return VS_CALL_YES_DOING;
 
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -228,17 +219,15 @@
     switch (eval)
     {
     case VCM_EVAL:
-            if(self.enemy)
-                return VS_CALL_NO;
+        if (self.enemy)
+            return VS_CALL_NO;
 
         return verb.verb_static_value;
 
-        break;
-
     case VCM_DO:
         self.moveto = self.origin;
 
-        if(vlen(self.velocity))
+        if (vlen(self.velocity))
             movelib_beak_simple(cvar("g_turrets_unit_ewheel_speed_stop"));
 
         return VS_CALL_YES_DOING;

Modified: trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc	2009-03-29 19:50:42 UTC (rev 6354)
+++ trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc	2009-03-29 21:47:59 UTC (rev 6355)
@@ -35,7 +35,7 @@
 
     self.ammo_flags = TFL_AMMO_BULLETS | TFL_AMMO_RECHARGE | TFL_AMMO_RECIVE;
     self.turrcaps_flags = TFL_TURRCAPS_PLAYERKILL;// | TFL_TURRCAPS_MISSILEKILL;
-    self.aim_flags = TFL_AIM_LEAD | TFL_AIM_ZEASE;
+    self.aim_flags = TFL_AIM_LEAD;
 
     if(cvar("g_antilag_bullets"))
         self.turrcaps_flags |= TFL_TURRCAPS_HITSCAN;

Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc	2009-03-29 19:50:42 UTC (rev 6354)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc	2009-03-29 21:47:59 UTC (rev 6355)
@@ -507,7 +507,6 @@
             return verb.verb_static_value;
 
         return VS_CALL_NO;
-        break;
 
     case VCM_DO:
         // Do we have a path?
@@ -569,8 +568,6 @@
         else
             return VS_CALL_YES_DONE;
 
-        break;
-
     case VCM_REMOVE:
 
         if (self.pathcurrent)
@@ -579,8 +576,6 @@
         self.pathcurrent = world;
 
         return VS_CALL_YES_DONE;
-
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -603,8 +598,6 @@
 
         return VS_CALL_NO;
 
-        break;
-
     case VCM_DO:
         switch (self.waterlevel)
         {
@@ -628,7 +621,6 @@
         self.steerto = steerlib_attract2(self.moveto,0.5,500,0.95);
 
         return VS_CALL_YES_DOING;
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -644,7 +636,6 @@
             return VS_CALL_NO;
 
         return verb.verb_static_value;
-        break;
 
     case VCM_DO:
 
@@ -653,7 +644,6 @@
         self.animflag = ANIM_NO;
 
         return VS_CALL_YES_DOING;
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -669,7 +659,6 @@
             return VS_CALL_NO;
 
         return verb.verb_static_value;
-        break;
 
     case VCM_DO:
         if(verb.wait < time)
@@ -716,8 +705,6 @@
         }
 
         return VS_CALL_YES_DOING;
-
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -734,8 +721,6 @@
 
         return verb.verb_static_value;
 
-        break;
-
     case VCM_DO:
 
         //if (random() < 0.5)
@@ -744,8 +729,6 @@
         //    verbstack_push(self.walker_verbs_move, walker_moveverb_idle_roam,   WVM_IDLE + WVM_IDLE_UP,  random() * 15);
 
         return VS_CALL_YES_DOING;
-
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -776,8 +759,6 @@
 
         return VS_CALL_NO;
 
-        break;
-
     case VCM_DO:
 
         self.moveto   = self.enemy.origin;
@@ -785,8 +766,6 @@
         self.animflag = ANIM_MEELE;
 
         return VS_CALL_YES_DOING;
-
-        break;
     }
 
     return VS_CALL_YES_DONE;
@@ -814,8 +793,6 @@
 
         return verb.verb_static_value;
 
-        break;
-
     case VCM_DO:
 
         entity rv;
@@ -829,8 +806,6 @@
         self.tur_head.attack_finished_single = time + cvar("g_turrets_unit_walker_std_rocket_refire");
 
         return VS_CALL_YES_DONE;
-
-        break;
     }
 
     return VS_CALL_YES_DONE;