Reset glowmod and colormap after the skipforcemodels label, to avoid cases where...

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 3580a503aebd8311b1bc5dcc1e41a85ca4fe51ec..adf5496835774f60b3e734438e148d06bbf2682d 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -227,14 +227,6 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
                this.skin = this.forceplayermodels_saveskin;
        }
 
-       if(this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST)
-       {
-               // no glowmod or team colors for ghosts
-               this.glowmod = '0 0 0';
-               this.colormap = 0;
-               return;
-       }
-
        // forceplayercolors too
        if(teamplay)
        {
@@ -290,6 +282,14 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
 
        LABEL(skipforcemodels)
 
+       if(this.csqcmodel_effects & CSQCMODEL_EF_RESPAWNGHOST)
+       {
+               // no glowmod or team colors for ghosts
+               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;