Fix wrong respawn ghost colors with cl_forceuniqueplayercolors 1

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / csqcmodel_hooks.qc

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 78b84fdea6f3da3801773ede0622c4bbd6207cb5..99368d39370e37aa31eea427c12d944616d1c3b3 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -309,11 +309,15 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer)
                        this.colormap = 1024 + autocvar_cl_forcemyplayercolors;
                else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !gametype.m_1v1)
                {
-                       // Assign each enemy unique colors
+                       // Assign each enemy an unique color combination
                        // pick colors from 0 to 14 since 15 is the rainbow color
                        // pl01 0 1, pl02 1 2, ..., pl14 13 14, pl15 14 0
                        // pl16 0 2, pl17 1 3, ..., pl29 13  0, pl30 14 1
-                       int num = this.entnum - 1;
+                       int num;
+                       if (this.isplayermodel & ISPLAYER_CLIENT)
+                               num = this.entnum - 1;
+                       else
+                               num = this.sv_entnum - 1;
                        int c1 = num % 15;
                        int q = floor(num / 15);
                        int c2 = (c1 + 1 + q) % 15;