Merge branch 'master' into Lyberta/TeamplayOverhaul

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / client.qc

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 7a4f82fc5b2c33d317204992b5973e987dc9181d..48ea4c261d53bed840246686abfcba9543e55e77 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -1262,11 +1262,7 @@ void ClientConnect(entity this)
        if (teamplay)
        {
                CheckAllowedTeams(this);
-               int t = 0;
-               if (c1 >= 0) t |= BIT(0);
-               if (c2 >= 0) t |= BIT(1);
-               if (c3 >= 0) t |= BIT(2);
-               if (c4 >= 0) t |= BIT(3);
+               int t = GetAllowedTeams();
                stuffcmd(this, sprintf("set _teams_available %d\n", t));
        }
        else