summaryrefslogtreecommitdiff
path: root/src/hexen
diff options
context:
space:
mode:
Diffstat (limited to 'src/hexen')
-rw-r--r--src/hexen/mn_menu.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index 75433306..c418ce82 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -1175,6 +1175,17 @@ boolean MN_Responder(event_t * event)
return true;
}
+ // Allow the menu to be activated from a joystick button if a button
+ // is bound for joybmenu.
+ if (event->type == ev_joystick)
+ {
+ if (joybmenu >= 0 && (event->data1 & (1 << joybmenu)) != 0)
+ {
+ MN_ActivateMenu();
+ return true;
+ }
+ }
+
// Only care about keypresses beyond this point.
if (event->type != ev_keydown)