Merge branch 'master' into terencehill/dynamic_hud

[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 6a585e68ed9694e1d12bf0e5e713c65f342b2179..dfe918feca56d97da3c6479b54227ac96eafb5c7 100644 (file)
--- a/qcsrc/common/minigames/cl_minigames_hud.qc
+++ b/qcsrc/common/minigames/cl_minigames_hud.qc
@@ -1,6 +1,14 @@
 #include "cl_minigames_hud.qh"
+
+#include <common/ent_cs.qh>
+
 #include "minigames.qh"
 
+.vector colormod;
+
+#include <client/hud/hud_config.qh>
+#include <client/mapvoting.qh>
+
 // whether the mouse is over the given panel
 bool HUD_mouse_over(entity somepanel)
 {
@@ -213,15 +221,13 @@ void HUD_MinigameMenu_ClickCreate()
        {
                entity curr;
                entity prev = self;
-               FOREACH(Minigames, true, LAMBDA(
-               {
-                       curr = HUD_MinigameMenu_SpawnSubEntry(
-                               it.message, HUD_MinigameMenu_ClickCreate_Entry,  self );
+               FOREACH(Minigames, true, {
+                       curr = HUD_MinigameMenu_SpawnSubEntry(it.message, HUD_MinigameMenu_ClickCreate_Entry, self);
                        curr.netname = it.netname;
                        curr.model = strzone(minigame_texture(strcat(it.netname,"/icon")));
                        HUD_MinigameMenu_InsertEntry( curr, prev );
                        prev = curr;
-               }));
+               });
        }
 }
 
@@ -685,7 +691,7 @@ void HUD_Minigame_Mouse()
        if ( HUD_MinigameMenu_IsOpened() && HUD_mouse_over(HUD_PANEL(MINIGAME_MENU)) )
                HUD_MinigameMenu_MouseInput();
 
-       draw_cursor_normal(mousepos-'8 4 0', '1 1 1', panel_fg_alpha);
+       draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha);
 }
 
 bool HUD_Minigame_Showpanels()