From: terencehill <piuntn@gmail.com>
Date: Sun, 5 Apr 2015 12:16:30 +0000 (+0200)
Subject: Fix for #1465 "joining server while on map selection screen locks cursor"
X-Git-Tag: xonotic-v0.8.1~93^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c02f903b59fd0ddf8190bd28ccf2586d0bf20776;p=xonotic%2Fxonotic-data.pk3dir.git

Fix for #1465 "joining server while on map selection screen locks cursor"

Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index a596208a4..74a5df166 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4286,12 +4286,12 @@ void HUD_CenterPrint (void)
 	{
 		if(!autocvar_hud_panel_centerprint) return;
 
-		if (hud_configure_prev && hud_configure_prev != -1)
+		if(hud_configure_prev)
 			reset_centerprint_messages();
 	}
 	else
 	{
-		if (!hud_configure_prev)
+		if(!hud_configure_prev)
 			reset_centerprint_messages();
 		if (time > hud_configure_cp_generation_time)
 		{
diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 898f3eb56..4ddc049ba 100644
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -1233,7 +1233,7 @@ void HUD_Configure_Frame()
 			return;
 		}
 
-		if(!hud_configure_prev || hud_configure_prev == -1)
+		if(!hud_configure_prev)
 		{
 			if(autocvar_hud_cursormode)
 				setcursormode(1);
diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 13f9545fa..36ec4f7b8 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -158,8 +158,6 @@ void CSQC_Init(void)
 	WarpZone_Init();
 
 	hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
-	hud_configure_prev = -1;
-
 	draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
 }