From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 4 Dec 2010 15:23:38 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/glowmodreset'
X-Git-Tag: xonotic-v0.1.0preview~65^2~5
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=16496d2a82fba46621a4096a9de394ef400c0b1e;hp=d7a834f0cfbf327e001d53f09c7ddfe2e2783955;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/glowmodreset'

Conflicts:
	qcsrc/server/w_nex.qc
---

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index c0097ee56..db79588cf 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -389,7 +389,9 @@ void W_WeaponFrame()
 			v_forward = fo;
 			v_right = ri;
 			v_up = up;
+            self.weaponentity.weaponentity.glowmod = '0 0 0'; // reset glowmod, weapon think function only *might* set it
 			weapon_action(self.weapon, WR_THINK);
+            self.exteriorweaponentity.glowmod = self.weaponentity.weaponentity.glowmod; // exterior weaponmodel has the same glowmod
 		}
 		if (time + self.weapon_frametime * 0.5 >= self.weapon_nextthink)
 		{
diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 3a8840f0a..d3b768fef 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -96,8 +96,6 @@ float w_nex(float req)
 
         if(autocvar_g_balance_nex_charge)
         {
-            self.weaponentity.weaponentity.glowmod = '0 0 0'; // reset
-
             self.weaponentity.weaponentity.glowmod_x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * bound(0, self.weaponentity.weaponentity.glowmod_y + self.nex_charge / autocvar_g_balance_nex_charge_limit, 1);
             self.weaponentity.weaponentity.glowmod_y = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_half * bound(0, self.weaponentity.weaponentity.glowmod_y + self.nex_charge / autocvar_g_balance_nex_charge_limit, 1);
             self.weaponentity.weaponentity.glowmod_z = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_half * bound(0, self.weaponentity.weaponentity.glowmod_z + self.nex_charge / autocvar_g_balance_nex_charge_limit, 1);
@@ -108,7 +106,6 @@ float w_nex(float req)
                 self.weaponentity.weaponentity.glowmod_y = self.weaponentity.weaponentity.glowmod_y + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit);
                 self.weaponentity.weaponentity.glowmod_z = self.weaponentity.weaponentity.glowmod_z + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit);
             }
-            self.exteriorweaponentity.glowmod = self.weaponentity.weaponentity.glowmod;
         }
 
 		if(autocvar_g_balance_nex_secondary_chargepool)