Merge branch 'master' into Mario/minigames_merge

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / cl_minigames_hud.qc

diff --git a/qcsrc/common/minigames/cl_minigames_hud.qc b/qcsrc/common/minigames/cl_minigames_hud.qc
index fd6e9bc67eb16598e427fe7467bd448a8d0db632..4850224d95169ddc503a7141ef61c0593215906f 100644 (file)
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -1,7 +1,8 @@
 #include "minigames.qh"
 #include "../../client/mapvoting.qh"
 
-float HUD_mouse_over(entity somepanel)
+// whether the mouse is over the given panel
+bool HUD_mouse_over(entity somepanel)
 {
        vector pos = stov(cvar_string(strcat("hud_panel_", somepanel.panel_name, "_pos")));
        vector sz = stov(cvar_string(strcat("hud_panel_", somepanel.panel_name, "_size")));
@@ -13,6 +14,7 @@ float HUD_mouse_over(entity somepanel)
 // Minigame Board
 // ====================================================================
 
+// Draws the minigame game board
 void HUD_MinigameBoard ()
 {
        entity hud_minigame = world;
@@ -38,6 +40,7 @@ void HUD_MinigameBoard ()
 // ====================================================================
 // Minigame Status
 // ====================================================================
+// Draws the minigame status panel
 void HUD_MinigameStatus ()
 {
        entity hud_minigame = world;
@@ -76,22 +79,22 @@ entity HUD_MinigameMenu_entries;
 entity HUD_MinigameMenu_last_entry;
 
 // Minigame menu options: insert entry after the given location
-void HUD_MinigameMenu_InsertEntry(entity new, entity prev)
+void HUD_MinigameMenu_InsertEntry(entity entry, entity prev)
 {
        if ( !HUD_MinigameMenu_entries )
        {
-               HUD_MinigameMenu_entries = new;
-               HUD_MinigameMenu_last_entry = new;
+               HUD_MinigameMenu_entries = entry;
+               HUD_MinigameMenu_last_entry = entry;
                return;
        }
        
-       new.list_prev = prev;
-       new.list_next = prev.list_next;
+       entry.list_prev = prev;
+       entry.list_next = prev.list_next;
        if ( prev.list_next )
-               prev.list_next.list_prev = new;
+               prev.list_next.list_prev = entry;
        else
-               HUD_MinigameMenu_last_entry = new;
-       prev.list_next = new;
+               HUD_MinigameMenu_last_entry = entry;
+       prev.list_next = entry;
        
 }
 
@@ -188,6 +191,8 @@ bool HUD_MinigameMenu_Click_ExpandCollapse()
                }
                if ( self.list_next )
                        self.list_next.list_prev = self;
+               else
+                       HUD_MinigameMenu_last_entry = self;
        }
        else
        {
@@ -263,6 +268,7 @@ void HUD_MinigameMenu_ClickNoop()
 // Click action for Quit
 void HUD_MinigameMenu_ClickQuit()
 {
+       deactivate_minigame();
        minigame_cmd("end");
 }
 
@@ -310,7 +316,7 @@ void HUD_MinigameMenu_CustomEntry(entity parent, string menumessage, string even
                menumessage, HUD_MinigameMenu_ClickCustomEntry, parent );
        e.netname = event_arg;
        HUD_MinigameMenu_InsertEntry(e, parent);
-       dprint("CustomEntry ",ftos(num_for_edict(parent))," ",menumessage," ",event_arg,"\n");
+       //dprint("CustomEntry ",ftos(num_for_edict(parent))," ",menumessage," ",event_arg,"\n");
 }
 
 // Click action for the Current Game menu
@@ -460,7 +466,7 @@ void HUD_MinigameMenu_DrawColoredEntry(vector pos, string s, vector fontsize)
                                                          fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
-// minigame menu panel UI
+// Minigame menu panel UI
 void HUD_MinigameMenu ()
 {      
        if ( !HUD_MinigameMenu_IsOpened() )