From 8411ee5ab4bdefd8cd68e9ca70db39ee7c7f30ee Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 5 May 2022 13:32:28 +0200 Subject: [PATCH] Apply player glow color instead of weapon charge color to dropped vortex and oknex --- qcsrc/server/weapons/spawning.qc | 2 ++ qcsrc/server/weapons/throwing.qc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc index 30a2869f39..6a2d65db20 100644 --- 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; + else + this.glowmod = colormapPaletteColor(this.owner.clientcolors & 0x0F, true) * 2; GameItem def = wpn.m_pickup; _StartItem( diff --git a/qcsrc/server/weapons/throwing.qc b/qcsrc/server/weapons/throwing.qc index 719b599359..01c6ac0d20 100644 --- 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.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); -- 2.39.2