From f72632a078a35c47c6771d1758d1c4093820b994 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 30 Apr 2012 17:27:12 +0200 Subject: [PATCH] simplify --- qcsrc/client/csqcmodel_hooks.qc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index ac3a6952f..08e19dcaf 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -227,9 +227,12 @@ void CSQCPlayer_ForceModel_Apply(float islocalplayer) // only friend color is forced? // verify it is not equal to the enemy color for(tm = teams.sort_next; tm; tm = tm.sort_next) - if(tm.team != myteam) - if(forcecolor_friend == 1024 + 17 * tm.team) - forcecolor_friend = 0; + // note: we even compare against our own team. + // if we rejected because we matched our OWN team color, + // this is not bad; we then simply keep our color as is + // anyway. + if(forcecolor_friend == 1024 + 17 * tm.team) + forcecolor_friend = 0; } float cm; -- 2.39.2