]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Cvar bugfix
authorz411 <z411@omaera.org>
Tue, 6 Jun 2023 00:03:42 +0000 (20:03 -0400)
committerz411 <z411@omaera.org>
Tue, 6 Jun 2023 00:03:42 +0000 (20:03 -0400)
notifications.cfg
qcsrc/server/teamplay.qc
qcsrc/server/teamplay.qh

index 6983630ef518585f005dd1a0ae589dd5f159e4e6..ece7b54a081463b7ce0b65b17507579ab78f9557 100644 (file)
@@ -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"
index 6e78c26be56caa63d1a1f2c65256e6f67a991830..e303eb565d9d1b5f64e890023e79f8ec038d638e 100644 (file)
@@ -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;
 }
index 08423dc082b21993e0207fab7dcb752ccebe97f4..7996379e7618f560302ac10cbdccfc564889c2e7 100644 (file)
@@ -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;