summaryrefslogtreecommitdiff
path: root/src/hexen
diff options
context:
space:
mode:
authorSimon Howard2014-04-19 01:35:40 -0400
committerSimon Howard2014-04-19 01:35:40 -0400
commitf0b710024a2820cd062163db29fddccc03cdf5a3 (patch)
tree86e56b81132ad73f26e5eec1fd4c510e7d363e94 /src/hexen
parent74e1b8b7548e6d14eb9be748279e8100a766cf04 (diff)
downloadchocolate-doom-f0b710024a2820cd062163db29fddccc03cdf5a3.tar.gz
chocolate-doom-f0b710024a2820cd062163db29fddccc03cdf5a3.tar.bz2
chocolate-doom-f0b710024a2820cd062163db29fddccc03cdf5a3.zip
joystick: Add joystick button to toggle menu.
When using a joystick or gamepad it's nice to be able to bring up the menu without having to reach for the keyboard. This makes modern gamepads more useful/usable.
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)