summaryrefslogtreecommitdiff
path: root/src/doom/m_menu.c
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/doom/m_menu.c
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/doom/m_menu.c')
-rw-r--r--src/doom/m_menu.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
index a0581579..271a100a 100644
--- a/src/doom/m_menu.c
+++ b/src/doom/m_menu.c
@@ -1524,6 +1524,11 @@ boolean M_Responder (event_t* ev)
key = key_menu_back;
joywait = I_GetTime() + 5;
}
+ if (joybmenu >= 0 && (ev->data1 & (1 << joybmenu)) != 0)
+ {
+ key = key_menu_activate;
+ joywait = I_GetTime() + 5;
+ }
}
else
{