From: terencehill <piuntn@gmail.com>
Date: Sun, 12 May 2019 23:29:21 +0000 (+0200)
Subject: Fix weapon glow color when vortex starts charging
X-Git-Tag: xonotic-v0.8.5~1498
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=294d334dc097ef5f41cfb1942f239fe4ea701c6d;p=xonotic%2Fxonotic-data.pk3dir.git

Fix weapon glow color when vortex starts charging
---

diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc
index 225b3d93f..cbcc285a5 100644
--- a/qcsrc/common/mutators/mutator/overkill/oknex.qc
+++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc
@@ -24,6 +24,9 @@ METHOD(OverkillNex, wr_glow, vector(OverkillNex this, entity actor, entity wepen
 		g.y += f * autocvar_g_weapon_charge_colormod_green_full;
 		g.z += f * autocvar_g_weapon_charge_colormod_blue_full;
 	}
+	// transition color can't be '0 0 0' as it defaults to player model glow color
+	if (g == '0 0 0')
+		g = '0 0 0.000001';
 	return g;
 }
 #endif
diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index f1e147503..fec4d756e 100644
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -29,6 +29,9 @@ METHOD(Vortex, wr_glow, vector(Vortex this, entity actor, entity wepent))
 		g.y += f * autocvar_g_weapon_charge_colormod_green_full;
 		g.z += f * autocvar_g_weapon_charge_colormod_blue_full;
 	}
+	// transition color can't be '0 0 0' as it defaults to player model glow color
+	if (g == '0 0 0')
+		g = '0 0 0.000001';
 	return g;
 }
 #endif