summaryrefslogtreecommitdiff
path: root/src/setup
diff options
context:
space:
mode:
authorSimon Howard2014-05-01 18:08:52 -0400
committerSimon Howard2014-05-01 18:08:52 -0400
commit0cd8f2e5fd268f48d09b5d38407ee5226dfd7e1b (patch)
treea15a03ee30d0d3759e2c8fa60b788efa43515822 /src/setup
parent10b94b8e2dfc86ccf3363a8a87e4a57a7fb24655 (diff)
parentf14065d0dc03ee2a67f60f513b941c46e73a915c (diff)
downloadchocolate-doom-0cd8f2e5fd268f48d09b5d38407ee5226dfd7e1b.tar.gz
chocolate-doom-0cd8f2e5fd268f48d09b5d38407ee5226dfd7e1b.tar.bz2
chocolate-doom-0cd8f2e5fd268f48d09b5d38407ee5226dfd7e1b.zip
Merge pull request #393 from chungy/master
setup: fix usejoystick/use_joystick typo in the previous commit
Diffstat (limited to 'src/setup')
-rw-r--r--src/setup/joystick.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index 792c1712..709ad34c 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -505,7 +505,7 @@ static int CalibrationEventCallback(SDL_Event *event, void *user_data)
// Finished?
if (calibrate_stage == CALIBRATE_CENTER)
{
- use_joystick = 1;
+ usejoystick = 1;
TXT_CloseWindow(calibration_window);
}