X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames_hud.qc;h=0acdb0da59964e20c6900b5ff4532b953fb35652;hb=32205c47c046b78ecfad958f855a3786fa18b1e5;hp=2049dc9eae601b8b03598fb74c2e49efbcba65bf;hpb=fb5876e8defeb6af31e62002be26bdfa2beb56a7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index 2049dc9ea..0acdb0da5 100644
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -10,6 +10,26 @@
 #include <client/hud/hud_config.qh>
 #include <client/mapvoting.qh>
 
+void HUD_MinigameBoard_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
+
+void HUD_MinigameStatus_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
+
+void HUD_MinigameHelp_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
+
+void HUD_MinigameMenu_Export(int fh)
+{
+	// allow saving cvars that aesthetically change the panel into hud skin files
+}
+
 // whether the mouse is over the given panel
 bool HUD_mouse_over(entity somepanel)
 {
@@ -26,10 +46,17 @@ bool HUD_mouse_over(entity somepanel)
 // Draws the minigame game board
 void HUD_MinigameBoard ()
 {
+	if (!HUD_MinigameMenu_IsOpened())
+		return;
+
 	entity hud_minigame = NULL;
 
 	if(!autocvar__hud_configure)
+	{
+		if (!active_minigame)
+			return;
 		hud_minigame = active_minigame.descriptor;
+	}
 	else
 		hud_minigame = minigame_get_descriptor("nmm");
 
@@ -52,10 +79,17 @@ void HUD_MinigameBoard ()
 // Draws the minigame status panel
 void HUD_MinigameStatus ()
 {
+	if (!HUD_MinigameMenu_IsOpened())
+		return;
+
 	entity hud_minigame = NULL;
 
 	if(!autocvar__hud_configure)
+	{
+		if (!active_minigame)
+			return;
 		hud_minigame = active_minigame.descriptor;
+	}
 	else
 		hud_minigame = minigame_get_descriptor("nmm");
 
@@ -205,7 +239,7 @@ bool HUD_MinigameMenu_Click_ExpandCollapse(entity this)
 	{
 		for ( e = HUD_MinigameMenu_entries; e != NULL; e = e.list_next )
 		{
-			if ( e.flags & 2 && e.origin_x == this.origin_x)
+			if ( (e.flags & 2) && e.origin_x == this.origin_x)
 				HUD_MinigameMenu_Click(e);
 		}
 
@@ -357,9 +391,6 @@ void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger)
 		HUD_MinigameMenu_entries = NULL;
 		HUD_MinigameMenu_last_entry = NULL;
 		HUD_MinigameMenu_activeitem = NULL;
-		if(autocvar_hud_cursormode)
-		if ( !autocvar__hud_configure )
-			setcursormode(0);
 	}
 }
 
@@ -410,7 +441,7 @@ void HUD_MinigameMenu_CurrentButton()
 // Open the minigame menu panel
 void HUD_MinigameMenu_Open()
 {
-	if ( !HUD_MinigameMenu_IsOpened() )
+	if ( !mv_active && !HUD_MinigameMenu_IsOpened() )
 	{
 		HUD_MinigameMenu_InsertEntry( HUD_MinigameMenu_SpawnEntry(
 			_("Create"), '0 0 0', hud_fontsize*1.5,'0.7 0.84 1', HUD_MinigameMenu_ClickCreate),
@@ -420,8 +451,6 @@ void HUD_MinigameMenu_Open()
 			HUD_MinigameMenu_last_entry );
 		HUD_MinigameMenu_CurrentButton();
 		HUD_MinigameMenu_activeitem = NULL;
-		if(autocvar_hud_cursormode)
-			setcursormode(1);
 	}
 }
 
@@ -473,6 +502,13 @@ void HUD_MinigameMenu_DrawColoredEntry(vector pos, string s, vector fontsize)
 // Minigame menu panel UI
 void HUD_MinigameMenu ()
 {
+	if (mv_active)
+	{
+		if (HUD_MinigameMenu_IsOpened())
+			HUD_MinigameMenu_Close(NULL, NULL, NULL);
+		return;
+	}
+
 	if ( !HUD_MinigameMenu_IsOpened() )
 		return;
 
@@ -536,12 +572,19 @@ void HUD_MinigameMenu ()
 
 void HUD_MinigameHelp()
 {
+	if (!HUD_MinigameMenu_IsOpened())
+		return;
+
 	string help_message;
 
 	if(!autocvar__hud_configure)
+	{
+		if (!active_minigame)
+			return;
 		help_message = active_minigame.message;
+	}
 	else
-		help_message = "Minigame message";
+		help_message = _("Minigame message");
 
 	if ( !help_message )
 		return;
@@ -683,11 +726,6 @@ void HUD_Minigame_Mouse()
 	if( !HUD_MinigameMenu_IsOpened() || autocvar__hud_configure || mv_active )
 		return;
 
-	if (!autocvar_hud_cursormode)
-		update_mousepos();
-
 	if ( HUD_MinigameMenu_IsOpened() && HUD_mouse_over(HUD_PANEL(MINIGAMEMENU)) )
 		HUD_MinigameMenu_MouseInput();
-
-	draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha);
 }