X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames_hud.qc;h=ca2a0ed17c9234e306d03b4cabce5910cf9d79f8;hb=d271f27a5ac351a3a7b39636932f6d661492be1d;hp=e93c95ca6077bed5935373c47bf0e1426f4c3315;hpb=0fd6fa4f46e6e704eceac437d05daa326fa8cb14;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 e93c95ca6..ca2a0ed17 100644 --- 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 + #include "minigames.qh" +.vector colormod; + +#include +#include + // whether the mouse is over the given panel bool HUD_mouse_over(entity somepanel) { @@ -107,7 +115,7 @@ void HUD_MinigameMenu_Click(entity menuitem) {SELFPARAM(); if ( menuitem ) { - WITH(entity, self, menuitem, menuitem.use()); + WITHSELF(menuitem, menuitem.use()); } } @@ -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,9 +691,7 @@ void HUD_Minigame_Mouse() if ( HUD_MinigameMenu_IsOpened() && HUD_mouse_over(HUD_PANEL(MINIGAME_MENU)) ) HUD_MinigameMenu_MouseInput(); - vector cursorsize = '32 32 0'; - drawpic(mousepos-'8 4 0', strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), - cursorsize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL); + draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha); } bool HUD_Minigame_Showpanels()