AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 03:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

reset `highlight_item', check input mode for "mouse button up" event (#1697)

Browse Source
This commit is contained in:
Roman Fomin 2024-05-21 14:16:58 +07:00 committed by GitHub
parent 18693bc95b
commit 46e7b16b21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mn_menu.c
View File

@ -1913,6 +1913,7 @@ void MN_Back(void)
currentMenu = currentMenu->prevMenu; currentMenu = currentMenu->prevMenu;
itemOn = currentMenu->lastOn; itemOn = currentMenu->lastOn;
highlight_item = 0;
M_StartSound(sfx_swtchn); M_StartSound(sfx_swtchn);
} }
@ -1926,6 +1927,7 @@ void M_Init(void)
currentMenu = &MainDef; currentMenu = &MainDef;
menuactive = 0; menuactive = 0;
itemOn = currentMenu->lastOn; itemOn = currentMenu->lastOn;
highlight_item = 0;
whichSkull = 0; whichSkull = 0;
skullAnimCounter = 10; skullAnimCounter = 10;
saved_screenblocks = screenblocks; saved_screenblocks = screenblocks;
@ -2594,7 +2596,11 @@ boolean M_Responder(event_t *ev)
break; break;
case ev_mouseb_up: case ev_mouseb_up:
if (menu_input == mouse_mode)
{
return MouseResponder(); return MouseResponder();
}
return false;
case ev_mouse_state: case ev_mouse_state:
if (ev->data1 == EV_RESIZE_VIEWPORT && menu_input != mouse_mode) if (ev->data1 == EV_RESIZE_VIEWPORT && menu_input != mouse_mode)
@ -2905,6 +2911,7 @@ boolean M_Responder(event_t *ev)
currentMenu = currentMenu->prevMenu; currentMenu = currentMenu->prevMenu;
} }
itemOn = currentMenu->lastOn; itemOn = currentMenu->lastOn;
highlight_item = 0;
M_StartSound(sfx_swtchn); M_StartSound(sfx_swtchn);
} }
else else
@ -3018,6 +3025,7 @@ void MN_StartControlPanel(void)
menuactive = 1; menuactive = 1;
currentMenu = &MainDef; // JDC currentMenu = &MainDef; // JDC
itemOn = currentMenu->lastOn; // JDC itemOn = currentMenu->lastOn; // JDC
highlight_item = 0;
print_warning_about_changes = false; // killough 11/98 print_warning_about_changes = false; // killough 11/98
G_ClearInput(); G_ClearInput();