From: terencehill <piuntn@gmail.com>
Date: Mon, 1 Jun 2020 13:01:36 +0000 (+0200)
Subject: Add cl_respawn_ghosts_keepcolors (disabled by default)
X-Git-Tag: xonotic-v0.8.5~971
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5d22cdfc01225c419f32429cac9180a81db8bef;p=xonotic%2Fxonotic-data.pk3dir.git

Add cl_respawn_ghosts_keepcolors (disabled by default)
---

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 06d89929a..7c6de40db 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -61,6 +61,7 @@ bool autocvar_cl_particles_oldvortexbeam;
 float autocvar_cl_particles_quality;
 bool autocvar_cl_projectiles_sloppy;
 bool autocvar_cl_readpicture_force;
+bool autocvar_cl_respawn_ghosts_keepcolors;
 bool autocvar_cl_reticle = 1;
 float autocvar_cl_reticle_normal_alpha = 1;
 bool autocvar_cl_reticle_weapon = 1;
diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index adf549683..99456bd3e 100644
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -282,9 +282,8 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 
 	LABEL(skipforcemodels)
 
-	if(this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST)
+	if((this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST) && !autocvar_cl_respawn_ghosts_keepcolors)
 	{
-		// no glowmod or team colors for ghosts
 		this.glowmod = '0 0 0';
 		this.colormap = 0;
 		return;
diff --git a/xonotic-client.cfg b/xonotic-client.cfg
index 089d86802..244faaa41 100644
--- a/xonotic-client.cfg
+++ b/xonotic-client.cfg
@@ -230,6 +230,8 @@ seta cl_damageeffect_lifetime_max 6 "maximum lifetime a damage effect may have"
 set cl_deathglow 2 "number of seconds during which dead bodies glow out"
 set cl_deathglow_min 0.5 "glow out up to this glow factor"
 
+set cl_respawn_ghosts_keepcolors 0 "if enabled respawn ghosts keep body colors"
+
 cl_movement 1
 cl_movement_track_canjump 0
 cl_stairsmoothspeed 200