From: terencehill <piuntn@gmail.com>
Date: Mon, 8 Jun 2020 16:20:23 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/glowmod_color_fix
X-Git-Tag: xonotic-v0.8.5~7^2~13^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5adc9ca82afe8f5bb4bd1346a0cf9934622818ba;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/glowmod_color_fix
---

5adc9ca82afe8f5bb4bd1346a0cf9934622818ba
diff --cc qcsrc/client/csqcmodel_hooks.qc
index 95bf3c91f8,99456bd3ed..41217ca4cc
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@@ -284,9 -282,16 +282,16 @@@ void CSQCPlayer_ModelAppearance_Apply(e
  
  	LABEL(skipforcemodels)
  
+ 	if((this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST) && !autocvar_cl_respawn_ghosts_keepcolors)
+ 	{
+ 		this.glowmod = '0 0 0';
+ 		this.colormap = 0;
+ 		return;
+ 	}
+ 
  	// 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';