diff options
author | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
---|---|---|
committer | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
commit | 27b5915111ffbdae97ce0c415157e104ee6f3493 (patch) | |
tree | 850fc62208b642b07047e0a9ea968c365d4dfd1f /src/setup/joystick.c | |
parent | 350ac122030d198b187255b19b2519ef8267364a (diff) | |
parent | ad027ef6dbfeebabe0e6701eec968e9d474e497f (diff) | |
download | chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.gz chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.bz2 chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.zip |
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
Diffstat (limited to 'src/setup/joystick.c')
-rw-r--r-- | src/setup/joystick.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c index 49931312..dc94b2f0 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -757,20 +757,20 @@ void BindJoystickVariables(void) { int i; - M_BindVariable("use_joystick", &usejoystick); - M_BindVariable("joystick_index", &joystick_index); - M_BindVariable("joystick_x_axis", &joystick_x_axis); - M_BindVariable("joystick_y_axis", &joystick_y_axis); - M_BindVariable("joystick_strafe_axis", &joystick_strafe_axis); - M_BindVariable("joystick_x_invert", &joystick_x_invert); - M_BindVariable("joystick_y_invert", &joystick_y_invert); - M_BindVariable("joystick_strafe_invert",&joystick_strafe_invert); + M_BindIntVariable("use_joystick", &usejoystick); + M_BindIntVariable("joystick_index", &joystick_index); + M_BindIntVariable("joystick_x_axis", &joystick_x_axis); + M_BindIntVariable("joystick_y_axis", &joystick_y_axis); + M_BindIntVariable("joystick_strafe_axis", &joystick_strafe_axis); + M_BindIntVariable("joystick_x_invert", &joystick_x_invert); + M_BindIntVariable("joystick_y_invert", &joystick_y_invert); + M_BindIntVariable("joystick_strafe_invert", &joystick_strafe_invert); for (i = 0; i < NUM_VIRTUAL_BUTTONS; ++i) { char name[32]; M_snprintf(name, sizeof(name), "joystick_physical_button%i", i); - M_BindVariable(name, &joystick_physical_buttons[i]); + M_BindIntVariable(name, &joystick_physical_buttons[i]); } } |