Merge branch 'terencehill/cl_forceplayercolors_2' into 'master'

cl_forceplayercolors 2

Applying your own player model colors to the enemies in a DM game is fine but doing it in team games too is confusing, as they don't match gameplay items (flags, keys, etc...), HUD and message colors at all.  With this patch this feature can be enabled in team games too by setting cl_forceplayercolors to 2 while in the menu it can be enabled only in DM games (cl_forceplayercolors 1).

See merge request !270

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 83650a9f16814bfc90de341c3028b8829b3141d9..b8cb150d6aabf3b0c86687bc5341f733a9e0406c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1178,7 +1178,7 @@ set waypoint_benchmark 0 "quit after waypoint loading to benchmark bot navigatio
 set g_debug_bot_commands 0 "print scripted bot commands before executing"
 set g_debug_defaultsounds 0 "always use default sounds"
 seta cl_forceplayermodels 0 "make everyone look like your own model (requires server to have sv_defaultcharacter 0)"
-seta cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_defaultcharacter 0, and is ignored in teamplay with more than two teams)"
+seta cl_forceplayercolors 0 "make everyone look like your own color (requires server to have sv_defaultcharacter 0); set it to 2 to enable it even in teamplay (only when there are no more than two teams)"
 seta cl_forcemyplayermodel "" "set to the model file name you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayerskin 0 "set to the skin number you want to show yourself as (does not affect how enemies look with cl_forceplayermodels)"
 seta cl_forcemyplayercolors 0 "set to the color value (encoding is same as _cl_color) for your own player model (ignored in teamplay; does not affect how enemies look with cl_forceplayermodels)"

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)