From acee0f1ba5029b9db1e005807ce2dcc69dd45ba4 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 14 May 2020 15:32:35 +0200 Subject: [PATCH] Fix #2434 "Wrong glow color of fullbright player models" --- qcsrc/client/csqcmodel_hooks.qc | 2 +- qcsrc/client/weapons/projectile.qc | 2 +- qcsrc/common/turrets/cl_turrets.qc | 2 +- qcsrc/common/weapons/all.qh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 1272758f76..95bf3c91f8 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -286,7 +286,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) // GLOWMOD AND DEATH FADING if(this.colormap > 0) - this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true) * 2; + this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true); else this.glowmod = '1 1 1'; diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc index 067c0badb7..4da48d6396 100644 --- a/qcsrc/client/weapons/projectile.qc +++ b/qcsrc/client/weapons/projectile.qc @@ -281,7 +281,7 @@ NET_HANDLE(ENT_CLIENT_PROJECTILE, bool isnew) // TODO: projectiles use glowmaps for their color, not teams #if 0 if(this.colormap > 0) - this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true) * 2; + this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true); else this.glowmod = '1 1 1'; #endif diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index df20e1ad2f..da67dd7a7c 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -9,7 +9,7 @@ void turret_remove(entity this) .vector glowmod; void turret_changeteam(entity this) { - this.glowmod = Team_ColorRGB(this.team - 1) * 2; + this.glowmod = Team_ColorRGB(this.team - 1); this.teamradar_color = Team_ColorRGB(this.team - 1); if(this.team) diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 26b40084bf..a2ea69a8ee 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -345,7 +345,7 @@ STATIC_INIT(register_weapons_done) vector weaponentity_glowmod(Weapon wep, entity actor, int c, entity wepent) { vector g; - if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true) * 2; + if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true); return g; } -- 2.39.2