]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
undo the fteqcc compiler bug workaround again (we really shouldn't need it)
authorRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:45:28 +0000 (22:45 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 6 Nov 2010 21:45:28 +0000 (22:45 +0100)
qcsrc/server/w_nex.qc

index c1687536541c01838a41550618ced3dc28b850fc..493fd005bea62bfd546c6b66949c7b0bd5a3ed94 100644 (file)
@@ -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);