X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames_hud.qc;h=1608f471da24f10c4e09e32bcb8a8e1ef0345e71;hb=9677a6f1dd8dbca207cf972f8cfa3ca6a8e4820e;hp=c26109bfd39e488179eddba303a3d5f5b974aac2;hpb=ccfe623f2fb4ce7594b5d692954edcd65b81c89d;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 c26109bfd..1608f471d 100644 --- a/qcsrc/common/minigames/cl_minigames_hud.qc +++ b/qcsrc/common/minigames/cl_minigames_hud.qc @@ -1,5 +1,6 @@ #include "cl_minigames_hud.qh" +#include #include #include "minigames.qh" @@ -25,17 +26,24 @@ 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"); if ( !hud_minigame ) return; - HUD_Panel_UpdateCvars(); + HUD_Panel_LoadCvars(); vector pos, mySize; @@ -51,17 +59,24 @@ 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"); if ( !hud_minigame ) return; - HUD_Panel_UpdateCvars(); + HUD_Panel_LoadCvars(); vector pos, mySize; @@ -143,7 +158,7 @@ void HUD_MinigameMenu_EraseEntry ( entity e ) if ( HUD_MinigameMenu_activeitem == e ) HUD_MinigameMenu_activeitem = NULL; - remove(e); + delete(e); } // Minigame menu options: create entry @@ -193,7 +208,7 @@ bool HUD_MinigameMenu_Click_ExpandCollapse(entity this) if ( e.flags & 2 ) HUD_MinigameMenu_Click(e); this.list_next = e.list_next; - remove(e); + delete(e); } if ( this.list_next ) this.list_next.list_prev = this; @@ -351,14 +366,11 @@ void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger) for ( e = HUD_MinigameMenu_entries; e != NULL; e = p ) { p = e.list_next; - remove(e); + delete(e); } HUD_MinigameMenu_entries = NULL; HUD_MinigameMenu_last_entry = NULL; HUD_MinigameMenu_activeitem = NULL; - if(autocvar_hud_cursormode) - if ( !autocvar__hud_configure ) - setcursormode(0); } } @@ -409,7 +421,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), @@ -419,17 +431,15 @@ void HUD_MinigameMenu_Open() HUD_MinigameMenu_last_entry ); HUD_MinigameMenu_CurrentButton(); HUD_MinigameMenu_activeitem = NULL; - if(autocvar_hud_cursormode) - setcursormode(1); } } // Handles mouse input on to minigame menu panel void HUD_MinigameMenu_MouseInput() { - panel = HUD_PANEL(MINIGAME_MENU); + panel = HUD_PANEL(MINIGAMEMENU); - HUD_Panel_UpdateCvars(); + HUD_Panel_LoadCvars(); if(panel_bg_padding) { @@ -472,13 +482,20 @@ 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; - HUD_Panel_UpdateCvars(); + HUD_Panel_LoadCvars(); HUD_Scale_Disable(); - HUD_Panel_DrawBg(1); + HUD_Panel_DrawBg(); if(panel_bg_padding) { @@ -535,17 +552,24 @@ 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; - HUD_Panel_UpdateCvars(); + HUD_Panel_LoadCvars(); vector pos, mySize; @@ -575,7 +599,7 @@ float HUD_Minigame_InputEvent(float bInputType, float nPrimary, float nSecondary { mousepos_x = nPrimary; mousepos_y = nSecondary; - if ( minigame_isactive() && HUD_mouse_over(HUD_PANEL(MINIGAME_BOARD)) ) + if ( active_minigame && HUD_mouse_over(HUD_PANEL(MINIGAMEBOARD)) ) active_minigame.minigame_event(active_minigame,"mouse_moved",mousepos); return true; @@ -607,13 +631,13 @@ float HUD_Minigame_InputEvent(float bInputType, float nPrimary, float nSecondary return false; } - if ( minigame_isactive() && ( bInputType == 0 || bInputType == 1 ) ) + if ( active_minigame && ( bInputType == 0 || bInputType == 1 ) ) { string device = ""; string action = bInputType == 0 ? "pressed" : "released"; if ( nPrimary >= K_MOUSE1 && nPrimary <= K_MOUSE16 ) { - if ( HUD_mouse_over(HUD_PANEL(MINIGAME_BOARD)) ) + if ( HUD_mouse_over(HUD_PANEL(MINIGAMEBOARD)) ) device = "mouse"; } else @@ -629,7 +653,7 @@ float HUD_Minigame_InputEvent(float bInputType, float nPrimary, float nSecondary if ( bInputType == 0 ) { if ( nPrimary == K_MOUSE1 && HUD_MinigameMenu_activeitem && - HUD_mouse_over(HUD_PANEL(MINIGAME_MENU)) ) + HUD_mouse_over(HUD_PANEL(MINIGAMEMENU)) ) { HUD_MinigameMenu_Click(HUD_MinigameMenu_activeitem); return true; @@ -682,21 +706,6 @@ void HUD_Minigame_Mouse() if( !HUD_MinigameMenu_IsOpened() || autocvar__hud_configure || mv_active ) return; - if(!autocvar_hud_cursormode) - { - mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed; - - mousepos_x = bound(0, mousepos_x, vid_conwidth); - mousepos_y = bound(0, mousepos_y, vid_conheight); - } - - if ( HUD_MinigameMenu_IsOpened() && HUD_mouse_over(HUD_PANEL(MINIGAME_MENU)) ) + if ( HUD_MinigameMenu_IsOpened() && HUD_mouse_over(HUD_PANEL(MINIGAMEMENU)) ) HUD_MinigameMenu_MouseInput(); - - draw_cursor_normal(mousepos, '1 1 1', panel_fg_alpha); -} - -bool HUD_Minigame_Showpanels() -{ - return (HUD_MinigameMenu_IsOpened() && minigame_isactive()); }