X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=f1f581a83003077e3aa86a83cdb229c80799440f;hp=e74fee00d5630cd745f7f81e5e1fe3a60a98c9da;hb=af2f0cb624aaf967708b22e1303d113668af5114;hpb=f22b9f83b24cae4a7e31ef6e310214be7d735a4d diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index e74fee00d5..f1f581a830 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -236,7 +236,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) bool forceplayercolors_enabled = false; #define fpc autocvar_cl_forceplayercolors - if (ISGAMETYPE(DUEL)) + if (gametype.m_1v1) { if ((myteam != NUM_SPECTATOR) && (fpc == 1 || fpc == 2 || fpc == 3 || fpc == 5)) forceplayercolors_enabled = true; @@ -301,7 +301,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) { if(autocvar_cl_forcemyplayercolors && islocalplayer) this.colormap = 1024 + autocvar_cl_forcemyplayercolors; - else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !ISGAMETYPE(DUEL)) + else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !gametype.m_1v1) { // Assign each enemy unique colors // pick colors from 0 to 14 since 15 is the rainbow color