From: z411 <z411@omaera.org>
Date: Tue, 6 Jun 2023 00:03:42 +0000 (-0400)
Subject: Cvar bugfix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=86ec2dbdb8ddd084c6ed82aa7f39b662b781247b;p=xonotic%2Fxonotic-data.pk3dir.git

Cvar bugfix
---

diff --git a/notifications.cfg b/notifications.cfg
index 6983630ef..ece7b54a0 100644
--- a/notifications.cfg
+++ b/notifications.cfg
@@ -503,6 +503,7 @@ seta notification_CENTER_LMS_VISIBLE_OTHER "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_MISSING_PLAYERS "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_MISSING_TEAMS "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_MOVETOSPEC_IDLING "1" "0 = off, 1 = centerprint"
+seta notification_CENTER_MOVETOSPEC_REMOVE "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_NADE_BONUS "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_NADE_THROW "1" "0 = off, 1 = centerprint"
 seta notification_CENTER_NIX_COUNTDOWN "1" "0 = off, 1 = centerprint"
diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 6e78c26be..e303eb565 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -736,13 +736,13 @@ void Remove_Countdown(entity this)
 		delete(this);
 		remove_countdown = NULL;
 		remove_player = NULL;
-		remove_time = 0;
+		remove_timeleft = 0;
 
 		TeamBalance_RemoveExcessPlayers(NULL); // Check again for excess players in case someone also left while in countdown
 		return;
 	}
 
-	Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_MOVETOSPEC_REMOVE, remove_player.netname, remove_timeleft);
+	Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_MOVETOSPEC_REMOVE, playername(remove_player.netname, remove_player.team, true), remove_timeleft);
 	--remove_timeleft;
 	this.nextthink = time + 1;
 }
diff --git a/qcsrc/server/teamplay.qh b/qcsrc/server/teamplay.qh
index 08423dc08..7996379e7 100644
--- a/qcsrc/server/teamplay.qh
+++ b/qcsrc/server/teamplay.qh
@@ -9,6 +9,7 @@ bool autocvar_g_balance_teams;
 bool autocvar_g_balance_teams_prevent_imbalance;
 bool autocvar_g_balance_teams_queue;
 bool autocvar_g_balance_teams_remove;
+int autocvar_g_balance_teams_remove_wait;
 
 string autocvar_g_forced_team_otherwise;