Merge branch 'terencehill/cl_forceplayercolors_2' into 'master'

[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 7ebc11fe6afdc5000f24a97ba89f795d15ec233c..91f107486ea3845e897431927e73481bd2052f58 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -233,7 +233,7 @@ void CSQCPlayer_ModelAppearance_Apply(bool islocalplayer)
 
                if(autocvar_cl_forcemyplayercolors)
                        forcecolor_friend = 1024 + autocvar_cl_forcemyplayercolors;
-               if(autocvar_cl_forceplayercolors && team_count == 2)
+               if(autocvar_cl_forceplayercolors == 2 && team_count == 2)
                        forcecolor_enemy = 1024 + autocvar__cl_color;
 
                if(forcecolor_enemy && !forcecolor_friend)