diff options
| author | Simon Howard | 2008-12-08 20:50:06 +0000 |
|---|---|---|
| committer | Simon Howard | 2008-12-08 20:50:06 +0000 |
| commit | 0ec9859ec8cf39ce1223516161fb39ea44ed5c33 (patch) | |
| tree | b10b7339a12a5e6a568fc6c21c25d4ca073ef2fe | |
| parent | 4fa31de5c586b93ad54ce9cbd2ddd0ddb2e839b2 (diff) | |
| download | chocolate-doom-0ec9859ec8cf39ce1223516161fb39ea44ed5c33.tar.gz chocolate-doom-0ec9859ec8cf39ce1223516161fb39ea44ed5c33.tar.bz2 chocolate-doom-0ec9859ec8cf39ce1223516161fb39ea44ed5c33.zip | |
Update lists of keyboard/mouse/joystick buttons.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1411
| -rw-r--r-- | src/setup/joystick.c | 2 | ||||
| -rw-r--r-- | src/setup/keyboard.c | 11 | ||||
| -rw-r--r-- | src/setup/mouse.c | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c index b3ab624d..3d2b713b 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -66,7 +66,7 @@ static txt_button_t *joystick_button; static int *all_joystick_buttons[] = { &joybstraferight, &joybstrafeleft, &joybfire, &joybspeed, - &joybuse, &joybstrafe, + &joybuse, &joybstrafe, &joybjump }; // diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c index 2a366609..22fc8a02 100644 --- a/src/setup/keyboard.c +++ b/src/setup/keyboard.c @@ -34,9 +34,14 @@ static int vanilla_keyboard_mapping = 1; static int always_run = 0; -static int *allkeys[] = {&key_left, &key_right, &key_up, &key_down, - &key_strafeleft, &key_straferight, &key_fire, - &key_use, &key_strafe, &key_speed}; +static int *allkeys[] = { + &key_left, &key_right, &key_up, &key_down, + &key_strafeleft, &key_straferight, &key_strafe, + &key_jump, &key_fire, &key_use, &key_speed, + &key_flyup, &key_flydown, &key_flycenter, + &key_lookup, &key_lookdown, &key_lookcenter, + &key_invleft, &key_invright, &key_useartifact +}; static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var)) { diff --git a/src/setup/mouse.c b/src/setup/mouse.c index ed9abbfd..d464261f 100644 --- a/src/setup/mouse.c +++ b/src/setup/mouse.c @@ -48,6 +48,7 @@ static int *all_mouse_buttons[] = { &mousebstraferight, &mousebbackward, &mousebuse, + &mousebjump }; static void MouseSetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable)) |