stfu fteqcc

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 960e59d67492f8ddf5ad3959515d303932c9f043..db01a8f5887d76f1438bc357c5dddd05570ba389 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -462,6 +462,7 @@ void CheckAllowedTeams (entity for_whom)
        c1 = c2 = c3 = c4 = -1;
        cb1 = cb2 = cb3 = cb4 = 0;
 
+       teament_name = string_null;
        if(g_onslaught)
        {
                // onslaught is special
@@ -904,7 +905,7 @@ void SV_ChangeTeam(float _color)
                        scount = c2;
                else if(steam == 3)//scolor == COLOR_TEAM3 - 1)
                        scount = c3;
-               else if(steam == 4)//scolor == COLOR_TEAM4 - 1)
+               else // if(steam == 4)//scolor == COLOR_TEAM4 - 1)
                        scount = c4;
 
                if(scount) // started at a valid, nonempty team
@@ -979,7 +980,7 @@ void ShufflePlayerOutOfTeam (float source_team)
                steam = COLOR_TEAM2;
        else if(source_team == 3)
                steam = COLOR_TEAM3;
-       else if(source_team == 4)
+       else // if(source_team == 4)
                steam = COLOR_TEAM4;
 
        lowest_bot = world;