Merge branch 'menu-screenshot-fix' into 'master'

Menu screenshot fix

Closes #45

See merge request STJr/SRB2!413
This commit is contained in:
Digiku 2018-12-22 00:40:18 -05:00
commit 66dc5a8712
1 changed files with 4 additions and 0 deletions

View File

@ -1531,6 +1531,10 @@ boolean M_ScreenshotResponder(event_t *ev)
return false;
ch = ev->data1;
if (ch >= KEY_MOUSE1 && menuactive) // If it's not a keyboard key, then don't allow it in the menus!
return false;
if (ch == KEY_F8 || ch == gamecontrol[gc_screenshot][0] || ch == gamecontrol[gc_screenshot][1]) // remappable F8
M_ScreenShot();
else if (ch == KEY_F9 || ch == gamecontrol[gc_recordgif][0] || ch == gamecontrol[gc_recordgif][1]) // remappable F9