Apply player glow color instead of weapon charge color to dropped vortex and oknex

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 30a2869f399f42b1887a4d7e626364a3f7b81b4e..6a2d65db2075b19a02a74cbba26adf4f47c8d17b 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -152,6 +152,8 @@ void weapon_defaultspawnfunc(entity this, Weapon wpn)
 
        if(!this.owner)
                this.glowmod = wpn.wpcolor;
 
        if(!this.owner)
                this.glowmod = wpn.wpcolor;

+       else
+               this.glowmod = colormapPaletteColor(this.owner.clientcolors & 0x0F, true) * 2;

 
        GameItem def = wpn.m_pickup;
        _StartItem(
 
        GameItem def = wpn.m_pickup;
        _StartItem(

diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc
index 719b5993590891173a572c25584398b7882de4f5..01c6ac0d200634347c27d88ba2631322b8fb7c66 100644 (file)
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@ -49,7 +49,7 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector
        wep.owner = wep.enemy = own;
        wep.flags |= FL_TOSSED;
        wep.colormap = own.colormap;
        wep.owner = wep.enemy = own;
        wep.flags |= FL_TOSSED;
        wep.colormap = own.colormap;

-       wep.glowmod = weaponentity_glowmod(info, own, own.clientcolors, own.(weaponentity));
+       // wep.glowmod will be set in weapon_defaultspawnfunc

        navigation_dynamicgoal_init(wep, false);
 
        W_DropEvent(wr_drop,own,wpn,wep,weaponentity);
        navigation_dynamicgoal_init(wep, false);
 
        W_DropEvent(wr_drop,own,wpn,wep,weaponentity);