Merge remote branch 'origin/fruitiex/campaign'

diff --combined qcsrc/server/teamplay.qc
index 925739e308e45683ecd20342cee99d95d55c522d,83c494d0982ea0c6f252d44c57508a5b6dee8791..488767e48dd3fab2f7e9ee0fb1009d31cd9322ae
--- 1/qcsrc/server/teamplay.qc
--- 2/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@@ -150,7 -150,6 +150,7 @@@ void ReadGameCvars(
        }
  
        teams_matter = 0;
 +      serverflags &~= SERVERFLAG_TEAMPLAY;
  }
  
  void default_delayedinit()
@@@ -173,6 -172,8 +173,6 @@@ void InitGameplayMode(
  
        VoteReset();
  
 -      teams_matter = 0;
 -
        // make sure only ONE type is selected
        ReadGameCvars();
        WriteGameCvars();
@@@ -238,6 -239,7 +238,6 @@@
                game = GAME_CTF;
                gamemode_name = "Capture the Flag";
                ActivateTeamplay();
 -              g_ctf_win_mode = autocvar_g_ctf_win_mode;
                g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags;
                if(g_ctf_win_mode == 2)
                {
@@@ -627,11 -629,7 +627,7 @@@ void CheckAllowedTeams (entity for_whom
        c1 = c2 = c3 = c4 = -1;
        cb1 = cb2 = cb3 = cb4 = 0;
  
-       if(autocvar_g_campaign && for_whom && clienttype(for_whom) == CLIENTTYPE_REAL)
-       {
-               c1 = 0; // only allow RED team for player joining
-       }
-       else if(g_onslaught)
+       if(g_onslaught)
        {
                // onslaught is special
                head = findchain(classname, "onslaught_generator");