Merge remote branch 'origin/master' into samual/mutator_ctf

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index f0ce8fd142ec4027b10c524db8b97297a90a8968..a8042859e4eb9823cbaeebe7bd98ef9961ae50cc 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -68,7 +68,7 @@ string TeamNoName(float t)
 }
 
 void dom_init();
-void ctf_init();
+//void ctf_init();
 void runematch_init();
 void tdm_init();
 void nb_init();
@@ -161,7 +161,7 @@ void InitGameplayMode()
                g_ctf_ignore_frags = autocvar_g_ctf_ignore_frags;
                fraglimit_override = autocvar_capturelimit_override;
                leadlimit_override = autocvar_captureleadlimit_override;
-               ctf_init();
+               MUTATOR_ADD(gamemode_ctf);
                have_team_spawns = -1; // request team spawns
        }