]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Disable team queue on campaign
authorz411 <z411@omaera.org>
Wed, 31 May 2023 23:37:34 +0000 (19:37 -0400)
committerz411 <z411@omaera.org>
Wed, 31 May 2023 23:37:34 +0000 (19:37 -0400)
qcsrc/server/teamplay.qc

index bc9a2652cb92d94b950c17798d10adf8b163dc8a..140d52624855b452e81b572fce9b6947d2edb73e 100644 (file)
@@ -236,7 +236,7 @@ bool Player_SetTeamIndex(entity player, int index)
 
 bool IsQueueNeeded(entity ignore)
 {
-       return (teamplay && autocvar_g_balance_teams_queue && AVAILABLE_TEAMS == 2 && TeamBalance_AreEqual(ignore));
+       return (teamplay && autocvar_g_balance_teams_queue && !autocvar_g_campaign && AVAILABLE_TEAMS == 2 && TeamBalance_AreEqual(ignore));
 }
 
 entity SpectatorWantsJoin(entity this)
@@ -717,7 +717,7 @@ bool TeamBalance_AreEqual(entity ignore)
 
 void TeamBalance_RemoveExcessPlayers(entity ignore)
 {
-       if(AVAILABLE_TEAMS != 2) return;
+       if(AVAILABLE_TEAMS != 2 || autocvar_g_campaign) return;
 
        entity balance = TeamBalance_CheckAllowedTeams(ignore);
        TeamBalance_GetTeamCounts(balance, ignore);