From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 6 Nov 2010 21:45:28 +0000 (+0100)
Subject: undo the fteqcc compiler bug workaround again (we really shouldn't need it)
X-Git-Tag: xonotic-v0.1.0preview~183^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=76e7f293fc765400e5f9a43eff07326c74609c85;p=xonotic%2Fxonotic-data.pk3dir.git

undo the fteqcc compiler bug workaround again (we really shouldn't need it)
---

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index c16875365..493fd005b 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -46,12 +46,13 @@ void W_Nex_Attack (float issecondary)
 	if(cvar("g_balance_nex_charge"))
 	{
 		charge = cvar("g_balance_nex_charge_mindmg") / mydmg + (1 - cvar("g_balance_nex_charge_mindmg") / mydmg) * self.nex_charge;
-		self.nex_charge = self.nex_charge * cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce
+		self.nex_charge *= cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce
+		                                                                 // O RLY? -- divVerent
 	}
 	else
 		charge = 1;
-	mydmg = mydmg * charge;
-	myforce = myforce * charge;
+	mydmg *= charge;
+	myforce *= charge;
 
 	W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg);