From: terencehill <piuntn@gmail.com>
Date: Thu, 5 May 2022 11:32:28 +0000 (+0200)
Subject: Apply player glow color instead of weapon charge color to dropped vortex and oknex
X-Git-Tag: xonotic-v0.8.5~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8411ee5ab4bdefd8cd68e9ca70db39ee7c7f30ee;p=xonotic%2Fxonotic-data.pk3dir.git

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 30a2869f3..6a2d65db2 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 719b59935..01c6ac0d2 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);