X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=b2825bc825c79cab7e0e9a6ef5fde80e59a78a2e;hp=091cc466183efecd96bda5291383c2aab720acda;hb=ba5086b4bd0887b2444e19a4919222dd4f594d06;hpb=985f8850e3b43520a439ebffe01b3f1bc4a72f10

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 091cc4661..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);
@@ -178,7 +182,14 @@ void Shutdown()
 		if (!(calledhooks & HOOK_START))
 			localcmd("\n_cl_hook_gamestart nop\n");
 		if (!(calledhooks & HOOK_END))
+		{
+			int gamecount = cvar("cl_matchcount");
 			localcmd("\ncl_hook_gameend\n");
+			// NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+			// earlier versions of the game abuse the hook to set this cvar
+			localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+			//cvar_set("cl_matchcount", itos(gamecount + 1));
+		}
 	}
 
 	localcmd("\ncl_hook_shutdown\n");
@@ -443,6 +454,15 @@ void PostInit()
 	postinit = true;
 }
 
+void Release_Common_Keys()
+{
+	localcmd("-fire\n");
+	localcmd("-fire2\n");
+	localcmd("-use\n");
+	localcmd("-hook\n");
+	localcmd("-jump\n");
+}
+
 // CSQC_InputEvent : Used to perform actions based on any key pressed, key released and mouse on the client.
 // Return value should be 1 if CSQC handled the input, otherwise return 0 to have the input passed to the engine.
 // All keys are in ascii.
@@ -455,6 +475,10 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
 	TC(int, bInputType);
 	bool override = false;
 
+	override |= HUD_Scoreboard_InputEvent(bInputType, nPrimary, nSecondary);
+	if (override)
+		return true;
+
 	override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
 	if (override)
 		return true;
@@ -482,15 +506,23 @@ float CSQC_InputEvent(int bInputType, float nPrimary, float nSecondary)
 		if(nPrimary == K_ALT) hudShiftState |= S_ALT;
 		if(nPrimary == K_CTRL) hudShiftState |= S_CTRL;
 		if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+		if(nPrimary == K_TAB) hudShiftState |= S_TAB;
 	}
 	else {
 		if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
 		if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
 		if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+		if(nPrimary == K_TAB) hudShiftState -= (hudShiftState & S_TAB);
 	}
 
+	// NOTE: Shift-Escape must be filtered out because it's the hardcoded console shortcut
 	if (nPrimary == K_ESCAPE && !(hudShiftState & S_SHIFT) && key_pressed)
 	{
+		if (hudShiftState & S_TAB)
+		{
+			Scoreboard_UI_Enable(0);
+			return true;
+		}
 		if (!isdemo() && cvar("_menu_gamemenu_dialog_available"))
 		{
 			localcmd("\nmenu_showgamemenudialog\n");
@@ -1387,7 +1419,6 @@ bool net_handle_ServerWelcome()
 		return true;
 	}
 
-	welcome_msg_force_centerprint = ReadByte();
 	strcpy(hostname, ReadString());
 
 	string hostversion = ReadString();
@@ -1428,21 +1459,19 @@ void Welcome_Message_Show_Try()
 	if (!welcome_msg_menu_check_maxtime)
 		return;
 
-	bool want_dialog = (!welcome_msg_force_centerprint && !isdemo() && autocvar_cl_welcome_in_menu_dialog);
 	// if want dialog check if menu is initialized but for a short time
-	if (!want_dialog || cvar("_menu_initialized") == 2 || time > welcome_msg_menu_check_maxtime)
+	if (cvar("_menu_initialized") == 2 || time > welcome_msg_menu_check_maxtime)
 	{
-		if (want_dialog && cvar("_menu_welcome_dialog_available"))
+		if (cvar("_menu_welcome_dialog_available"))
 		{
 			string welcomedialog_args = strcat("HOSTNAME \"", hostname, "\"");
 			string msg = MakeConsoleSafe(strreplace("\n", "\\n", welcome_msg));
 			welcomedialog_args = strcat(welcomedialog_args, " WELCOME \"", msg, "\"");
 			localcmd("\nmenu_cmd directmenu Welcome ", welcomedialog_args, "\n");
-			if (intermission) // close it after it's been initialized so it can still be opened manually
+			if (intermission || isdemo() || !autocvar_cl_welcome)
+				// close it after it's been initialized so it can still be opened manually
 				localcmd("\ntogglemenu 0\n");
 		}
-		else
-			centerprint_Add(ORDINAL(CPID_MOTD), strcat(hostname, "\n\n\n", welcome_msg), -1, 0);
 
 		strfree(welcome_msg);
 		welcome_msg_menu_check_maxtime = 0;