From: terencehill Date: Wed, 23 Dec 2015 17:04:15 +0000 (+0100) Subject: cl_forceplayercolors no longer applies your own colors to the enemies in teamplay... X-Git-Tag: xonotic-v0.8.2~1427^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6cc42d0524db63203d14fb637f4511c04ec811f3;p=xonotic%2Fxonotic-data.pk3dir.git cl_forceplayercolors no longer applies your own colors to the enemies in teamplay, unless it's set to 2 --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 83650a9f1..b8cb150d6 100644 --- 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 83c3f448a..01534e6db 100644 --- 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)