From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 30 Nov 2015 05:56:50 +0000 (+1100)
Subject: Viewmodels: call wr_glow on activeweapon, not switchingweapon
X-Git-Tag: xonotic-v0.8.2~1601^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa22a972a79b496510c5d87390afb05a35ff5880;p=xonotic%2Fxonotic-data.pk3dir.git

Viewmodels: call wr_glow on activeweapon, not switchingweapon
---

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 6a6214a98..4714919b9 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -276,7 +276,7 @@ void viewmodel_draw(entity this)
 	float a = this.alpha;
 	int c = stof(getplayerkeyvalue(current_player, "colors"));
 	vector g;
-	Weapon wep = Weapons_from(switchingweapon);
+	Weapon wep = Weapons_from(activeweapon);
 	if (!(g = wep.wr_glow(wep))) g = colormapPaletteColor(c & 0x0F, true) * 2;
 	entity me = CSQCModel_server2csqc(player_localentnum - 1);
 	int fx = ((me.csqcmodel_effects & EFMASK_CHEAP)