Merge remote branch 'origin/fruitiex/campaign'

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 83c494d0982ea0c6f252d44c57508a5b6dee8791..488767e48dd3fab2f7e9ee0fb1009d31cd9322ae 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -150,6 +150,7 @@ void ReadGameCvars()
        }
 
        teams_matter = 0;
+       serverflags &~= SERVERFLAG_TEAMPLAY;
 }
 
 void default_delayedinit()
@@ -172,8 +173,6 @@ void InitGameplayMode()
 
        VoteReset();
 
-       teams_matter = 0;
-
        // make sure only ONE type is selected
        ReadGameCvars();
        WriteGameCvars();
@@ -239,7 +238,6 @@ void InitGameplayMode()
                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)
                {