zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: Mouse controls now respect MenuEntry_t's disabled flag.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4864 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-12-28 21:34:54 +00:00
parent d7b88df6af
commit 571a44cd8d
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
polymer/eduke32/source/menus.c
View file

@ -3530,6 +3530,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
menu->currentEntry = e; menu->currentEntry = e;
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
if (entry->flags & Disabled)
break;
M_RunMenuInput_MenuEntryLink_Activate(entry); M_RunMenuInput_MenuEntryLink_Activate(entry);
if (g_player[myconnectindex].ps->gm&MODE_MENU) // for skill selection if (g_player[myconnectindex].ps->gm&MODE_MENU) // for skill selection
@ -3572,6 +3575,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
menu->currentEntry = e; menu->currentEntry = e;
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
if (entry->flags & Disabled)
break;
M_RunMenuInput_MenuEntryOption_Activate(entry, object); M_RunMenuInput_MenuEntryOption_Activate(entry, object);
S_PlaySound(PISTOL_BODYHIT); S_PlaySound(PISTOL_BODYHIT);
@ -3620,6 +3626,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
menu->currentColumn = 1; menu->currentColumn = 1;
if (entry->flags & Disabled)
break;
M_RunMenuInput_MenuEntryCustom2Col_Activate(entry); M_RunMenuInput_MenuEntryCustom2Col_Activate(entry);
S_PlaySound(PISTOL_BODYHIT); S_PlaySound(PISTOL_BODYHIT);
@ -3640,6 +3649,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
menu->currentColumn = 0; menu->currentColumn = 0;
if (entry->flags & Disabled)
break;
M_RunMenuInput_MenuEntryCustom2Col_Activate(entry); M_RunMenuInput_MenuEntryCustom2Col_Activate(entry);
S_PlaySound(PISTOL_BODYHIT); S_PlaySound(PISTOL_BODYHIT);
@ -3719,6 +3731,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
menu->currentEntry = e; menu->currentEntry = e;
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
if (entry->flags & Disabled)
break;
// region between the x-midline of the slidepoint at the extremes slides proportionally // region between the x-midline of the slidepoint at the extremes slides proportionally
if (M_MouseWithinBounds(&m_mousepos, slideregionx, slidebary, slideregionwidth, height)) if (M_MouseWithinBounds(&m_mousepos, slideregionx, slidebary, slideregionwidth, height))
{ {
@ -3810,6 +3825,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
menu->currentEntry = e; menu->currentEntry = e;
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
if (entry->flags & Disabled)
break;
// region between the x-midline of the slidepoint at the extremes slides proportionally // region between the x-midline of the slidepoint at the extremes slides proportionally
if (M_MouseWithinBounds(&m_mousepos, slideregionx, slidebary, slideregionwidth, height)) if (M_MouseWithinBounds(&m_mousepos, slideregionx, slidebary, slideregionwidth, height))
{ {
@ -3901,6 +3919,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
menu->currentEntry = e; menu->currentEntry = e;
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
if (entry->flags & Disabled)
break;
// region between the x-midline of the slidepoint at the extremes slides proportionally // region between the x-midline of the slidepoint at the extremes slides proportionally
if (M_MouseWithinBounds(&m_mousepos, slideregionx, slidebary, slideregionwidth, height)) if (M_MouseWithinBounds(&m_mousepos, slideregionx, slidebary, slideregionwidth, height))
{ {
@ -3976,6 +3997,9 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
menu->currentEntry = e; menu->currentEntry = e;
M_RunMenuInput_MenuMenu_MovementVerify(menu); M_RunMenuInput_MenuMenu_MovementVerify(menu);
if (entry->flags & Disabled)
break;
M_RunMenuInput_MenuEntryString_Activate(entry); M_RunMenuInput_MenuEntryString_Activate(entry);
S_PlaySound(PISTOL_BODYHIT); S_PlaySound(PISTOL_BODYHIT);
@ -5219,6 +5243,9 @@ static void M_RunMenuInput(Menu_t *cm)
case String: case String:
{ {
if (currentry->flags & Disabled)
break;
if (I_AdvanceTrigger()) if (I_AdvanceTrigger())
{ {
I_AdvanceTriggerClear(); I_AdvanceTriggerClear();