From: Mario <mario@smbclan.net>
Date: Sat, 9 Jan 2016 15:16:53 +0000 (+1000)
Subject: Fix it properly (hopefully)
X-Git-Tag: xonotic-v0.8.2~1251
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0366770c97e88ade7118695647279773a8548b8f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix it properly (hopefully)
---

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 3bfca8075..6429ff899 100644
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -327,8 +327,6 @@ STATIC_INIT(register_weapons_done)
 .entity exteriorweaponentity;
 vector weaponentity_glowmod(Weapon wep, int c)
 {
-    if(!wep)
-        return '1 1 1'; // ???
     vector g;
     if (!(g = wep.wr_glow(wep))) g = colormapPaletteColor(c & 0x0F, true) * 2;
     return g;
diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index df0f7b691..14da0f14e 100644
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -78,7 +78,7 @@ string W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vecto
 	weapon_defaultspawnfunc(wep, info);
 	if(startitem_failed)
 		return string_null;
-	wep.glowmod = weaponentity_glowmod(wep, own.clientcolors);
+	wep.glowmod = weaponentity_glowmod(info, own.clientcolors);
 	wep.think = thrown_wep_think;
 	wep.savenextthink = wep.nextthink;
 	wep.nextthink = min(wep.nextthink, time + 0.5);