From: FruitieX Date: Sat, 16 Apr 2011 12:49:05 +0000 (+0300) Subject: fix something... X-Git-Tag: xonotic-v0.5.0~264^2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5bb18a9ff722f21c35189d010e6899be0f890849;p=xonotic%2Fxonotic-data.pk3dir.git fix something... --- diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc index 01fb50717..635b1ccf8 100644 --- a/qcsrc/server/w_shotgun.qc +++ b/qcsrc/server/w_shotgun.qc @@ -77,7 +77,7 @@ void shotgun_meleethink (void) Damage (trace_ent, self.owner, self.owner, autocvar_g_balance_shotgun_secondary_damage * min(1, f + 1), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force); remove(self); } - else if(time >= self.cnt + meleetime || self.owner.deadflag != DEAD_NO && autocvar_g_balance_shotgun_secondary_melee_no_doubleslap) // missed or owner died, remove ent + else if(time >= self.cnt + meleetime || (self.owner.deadflag != DEAD_NO && autocvar_g_balance_shotgun_secondary_melee_no_doubleslap)) // missed or owner died, remove ent remove(self); else // continue swinging the weapon in hope of hitting someone :) self.nextthink = time;