Fix it properly (hopefully)

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 3bfca807525bebede91426046a16cc8727ec4b37..6429ff899325e504aa99aeb398e9bc5da19a634c 100644 (file)
--- 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 df0f7b691f26769573ae87a7b2753df6b82df93f..14da0f14ec66388b7637910ca3cf36cfb0466145 100644 (file)
--- 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);