simplify

diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index ac3a6952fa9232c70e5f89b619c57c30fa2a8425..08e19dcafa278c93efbb21f0f5daa561c5a0674a 100644 (file)
--- 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;