mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-22 11:22:18 -04:00
reset `highlight_item', check input mode for "mouse button up" event (#1697)
This commit is contained in:
parent
18693bc95b
commit
46e7b16b21
@ -1913,6 +1913,7 @@ void MN_Back(void)
|
||||
|
||||
currentMenu = currentMenu->prevMenu;
|
||||
itemOn = currentMenu->lastOn;
|
||||
highlight_item = 0;
|
||||
M_StartSound(sfx_swtchn);
|
||||
}
|
||||
|
||||
@ -1926,6 +1927,7 @@ void M_Init(void)
|
||||
currentMenu = &MainDef;
|
||||
menuactive = 0;
|
||||
itemOn = currentMenu->lastOn;
|
||||
highlight_item = 0;
|
||||
whichSkull = 0;
|
||||
skullAnimCounter = 10;
|
||||
saved_screenblocks = screenblocks;
|
||||
@ -2594,7 +2596,11 @@ boolean M_Responder(event_t *ev)
|
||||
break;
|
||||
|
||||
case ev_mouseb_up:
|
||||
if (menu_input == mouse_mode)
|
||||
{
|
||||
return MouseResponder();
|
||||
}
|
||||
return false;
|
||||
|
||||
case ev_mouse_state:
|
||||
if (ev->data1 == EV_RESIZE_VIEWPORT && menu_input != mouse_mode)
|
||||
@ -2905,6 +2911,7 @@ boolean M_Responder(event_t *ev)
|
||||
currentMenu = currentMenu->prevMenu;
|
||||
}
|
||||
itemOn = currentMenu->lastOn;
|
||||
highlight_item = 0;
|
||||
M_StartSound(sfx_swtchn);
|
||||
}
|
||||
else
|
||||
@ -3018,6 +3025,7 @@ void MN_StartControlPanel(void)
|
||||
menuactive = 1;
|
||||
currentMenu = &MainDef; // JDC
|
||||
itemOn = currentMenu->lastOn; // JDC
|
||||
highlight_item = 0;
|
||||
print_warning_about_changes = false; // killough 11/98
|
||||
|
||||
G_ClearInput();
|
||||
|
Loading…
x
Reference in New Issue
Block a user