From: terencehill <piuntn@gmail.com>
Date: Sat, 23 Jul 2022 17:30:49 +0000 (+0200)
Subject: Oops, forgot to commit changes of main.qc in the previous commit
X-Git-Tag: xonotic-v0.8.6~407
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba5086b4bd0887b2444e19a4919222dd4f594d06;p=xonotic%2Fxonotic-data.pk3dir.git

Oops, forgot to commit changes of main.qc in the previous commit
---

diff --git a/commands.cfg b/commands.cfg
index 9899cf0f5..9dd270012 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -150,6 +150,7 @@ alias radar "qc_cmd_cl hud radar ${* ?}"
 alias scoreboard_columns_help "qc_cmd_cl hud scoreboard_columns_help"
 alias scoreboard_columns_set "qc_cmd_cl hud scoreboard_columns_set ${* ?}"
 
+set _scoreboard_team_selection_available 0 // set to 1 by CSQC
 alias _menu_showteamselect1 "_scoreboard_team_selection 1"
 alias _menu_showteamselect0 "menu_showteamselect"
 alias scoreboard_team_selection "_menu_showteamselect$_scoreboard_team_selection_available"
diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 62c5da4c9..b2825bc82 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -44,6 +44,9 @@
 
 void CSQC_Init()
 {
+	cvar_set("_scoreboard_team_selection_available", "1");
+	cvar_set("_scoreboard_team_selection", "0"); // in case it has been left set to 1
+
 	prvm_language = strzone(cvar_string("prvm_language"));
 
 #ifdef WATERMARK
@@ -149,6 +152,7 @@ void CSQC_Init()
 // CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
 void Shutdown()
 {
+	cvar_set("_scoreboard_team_selection_available", "0");
 	WarpZone_Shutdown();
 
 	delete(teams);