Add cl_respawn_ghosts_keepcolors (disabled by default)

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 06d89929ac961a0fd849d5f74888f0be3d772f7e..7c6de40db847f90172dff997bbde5678d64f57b9 100644 (file)
--- 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 adf5496835774f60b3e734438e148d06bbf2682d..99456bd3ed03d129d2fb2ffc741e380e612f66ec 100644 (file)
--- 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 089d86802198152f6042ef2143b0bd57b3459816..244faaa416ad3dc53511418f3ec57eeeae4945ff 100644 (file)
--- 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