#include "cl_minigames_hud.qh"
+#include <client/autocvars.qh>
#include <common/ent_cs.qh>
#include "minigames.qh"
// 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;
// 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;
HUD_MinigameMenu_entries = NULL;
HUD_MinigameMenu_last_entry = NULL;
HUD_MinigameMenu_activeitem = NULL;
- if(autocvar_hud_cursormode)
- if ( !autocvar__hud_configure )
- setcursormode(0);
}
}
// 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),
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)
{
// 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)
{
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";
if ( !help_message )
return;
- HUD_Panel_UpdateCvars();
+ HUD_Panel_LoadCvars();
vector pos, mySize;
{
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;
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
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;
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());
}