GameRules: make `GameRules_teams(true)` imply `have_team_spawns = -1`

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / onslaught / sv_onslaught.qh

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
index 70a5c8b6ba999078cb459c8933e2c11f7ab660e8..7f2434915e7a67b6d6ed269e36ecb4d351d88014 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qh
@@ -11,9 +11,8 @@ REGISTER_MUTATOR(ons, false)
                        error("This is a game type and it cannot be added at runtime.");
                ons_Initialize();
 
-               ActivateTeamplay();
-               SetLimits(autocvar_g_onslaught_point_limit, autocvar_leadlimit_override, autocvar_timelimit_override, -1);
-               have_team_spawns = -1; // request team spawns
+               GameRules_teams(true);
+               GameRules_limit_score(autocvar_g_onslaught_point_limit);
        }
 
        MUTATOR_ONROLLBACK_OR_REMOVE
@@ -44,17 +43,14 @@ const vector CPICON_OFFSET = ('0 0 96');
 // list of generators on the map
 entity ons_worldgeneratorlist;
 .entity ons_worldgeneratornext;
-.entity ons_stalegeneratornext;
 
 // list of control points on the map
 entity ons_worldcplist;
 .entity ons_worldcpnext;
-.entity ons_stalecpnext;
 
 // list of links on the map
 entity ons_worldlinklist;
 .entity ons_worldlinknext;
-.entity ons_stalelinknext;
 
 // definitions
 .entity sprite;
@@ -73,11 +69,8 @@ bool ons_stalemate;
 
 .float teleport_antispam;
 
-// waypoint sprites
-.entity bot_basewaypoint; // generator waypointsprite
-
-.bool isgenneighbor[17];
-.bool iscpneighbor[17];
+.int aregensneighbor;
+.int arecpsneighbor;
 float ons_notification_time[17];
 
 .float ons_overtime_damagedelay;