Merge remote branch 'origin/master' into tzork/gm_nexball

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

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index f0ce8fd142ec4027b10c524db8b97297a90a8968..3bb2ad156638eebf23ef0a69cd635ecc6d00471e 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -71,7 +71,6 @@ void dom_init();
 void ctf_init();
 void runematch_init();
 void tdm_init();
-void nb_init();
 void entcs_init();
 
 void LogTeamchange(float player_id, float team_number, float type)
@@ -257,13 +256,14 @@ void InitGameplayMode()
 
        if(g_nexball)
        {
+
                fraglimit_override = autocvar_g_nexball_goallimit;
                leadlimit_override = autocvar_g_nexball_goalleadlimit;
                ActivateTeamplay();
-               nb_init();
                have_team_spawns = -1; // request team spawns
+        MUTATOR_ADD(gamemode_nexball);
        }
-
+        
        if(g_keepaway)
        {
                MUTATOR_ADD(gamemode_keepaway);