From 9d18ab872b4b7bf160cbe47a4e5815f279c7f43f Mon Sep 17 00:00:00 2001 From: tzork Date: Sun, 29 Mar 2009 21:47:59 +0000 Subject: [PATCH] Fix warnings git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6355 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../server/tturrets/units/unit_ewheel.qc | 27 ++++++------------- .../server/tturrets/units/unit_machinegun.qc | 2 +- .../server/tturrets/units/unit_walker.qc | 25 ----------------- 3 files changed, 9 insertions(+), 45 deletions(-) diff --git a/data/qcsrc/server/tturrets/units/unit_ewheel.qc b/data/qcsrc/server/tturrets/units/unit_ewheel.qc index 4968fec5f..7cdef3f93 100644 --- a/data/qcsrc/server/tturrets/units/unit_ewheel.qc +++ b/data/qcsrc/server/tturrets/units/unit_ewheel.qc @@ -71,7 +71,6 @@ float ewheel_moveverb_path(float eval) return verb.verb_static_value; return VS_CALL_NO; - break; case VCM_DO: // Do we have a path? @@ -127,8 +126,6 @@ float ewheel_moveverb_path(float eval) else return VS_CALL_YES_DONE; - break; - case VCM_REMOVE: if (self.pathcurrent) @@ -137,8 +134,6 @@ float ewheel_moveverb_path(float eval) self.pathcurrent = world; return VS_CALL_YES_DONE; - - break; } return VS_CALL_YES_DONE; @@ -149,13 +144,11 @@ float ewheel_moveverb_enemy(float eval) 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 @@ float ewheel_moveverb_runaway(float eval) 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 @@ float ewheel_moveverb_runaway(float eval) return VS_CALL_YES_DOING; - break; } return VS_CALL_YES_DONE; @@ -228,17 +219,15 @@ float ewheel_moveverb_idle(float eval) 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; diff --git a/data/qcsrc/server/tturrets/units/unit_machinegun.qc b/data/qcsrc/server/tturrets/units/unit_machinegun.qc index fcb381bbe..8eeba410a 100644 --- a/data/qcsrc/server/tturrets/units/unit_machinegun.qc +++ b/data/qcsrc/server/tturrets/units/unit_machinegun.qc @@ -35,7 +35,7 @@ void turret_machinegun_std_init() 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; diff --git a/data/qcsrc/server/tturrets/units/unit_walker.qc b/data/qcsrc/server/tturrets/units/unit_walker.qc index 8c47d0116..0fb15e56e 100644 --- a/data/qcsrc/server/tturrets/units/unit_walker.qc +++ b/data/qcsrc/server/tturrets/units/unit_walker.qc @@ -507,7 +507,6 @@ float walker_moveverb_path(float eval) return verb.verb_static_value; return VS_CALL_NO; - break; case VCM_DO: // Do we have a path? @@ -569,8 +568,6 @@ float walker_moveverb_path(float eval) else return VS_CALL_YES_DONE; - break; - case VCM_REMOVE: if (self.pathcurrent) @@ -579,8 +576,6 @@ float walker_moveverb_path(float eval) self.pathcurrent = world; return VS_CALL_YES_DONE; - - break; } return VS_CALL_YES_DONE; @@ -603,8 +598,6 @@ float walker_moveverb_enemy(float eval) return VS_CALL_NO; - break; - case VCM_DO: switch (self.waterlevel) { @@ -628,7 +621,6 @@ float walker_moveverb_enemy(float eval) 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 @@ float walker_moveverb_idle_pause(float eval) return VS_CALL_NO; return verb.verb_static_value; - break; case VCM_DO: @@ -653,7 +644,6 @@ float walker_moveverb_idle_pause(float eval) self.animflag = ANIM_NO; return VS_CALL_YES_DOING; - break; } return VS_CALL_YES_DONE; @@ -669,7 +659,6 @@ float walker_moveverb_idle_roam(float eval) return VS_CALL_NO; return verb.verb_static_value; - break; case VCM_DO: if(verb.wait < time) @@ -716,8 +705,6 @@ float walker_moveverb_idle_roam(float eval) } return VS_CALL_YES_DOING; - - break; } return VS_CALL_YES_DONE; @@ -734,8 +721,6 @@ float walker_moveverb_idle(float eval) return verb.verb_static_value; - break; - case VCM_DO: //if (random() < 0.5) @@ -744,8 +729,6 @@ float walker_moveverb_idle(float eval) // 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 @@ float walker_attackverb_meele(float eval) return VS_CALL_NO; - break; - case VCM_DO: self.moveto = self.enemy.origin; @@ -785,8 +766,6 @@ float walker_attackverb_meele(float eval) self.animflag = ANIM_MEELE; return VS_CALL_YES_DOING; - - break; } return VS_CALL_YES_DONE; @@ -814,8 +793,6 @@ float walker_attackverb_rockets(float eval) return verb.verb_static_value; - break; - case VCM_DO: entity rv; @@ -829,8 +806,6 @@ float walker_attackverb_rockets(float eval) 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; -- 2.39.2