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/txt_joyaxis.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/txt_joyaxis.c')
| -rw-r--r-- | src/setup/txt_joyaxis.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/setup/txt_joyaxis.c b/src/setup/txt_joyaxis.c index 4747a4ff..5e59b9f7 100644 --- a/src/setup/txt_joyaxis.c +++ b/src/setup/txt_joyaxis.c @@ -63,6 +63,8 @@ static char *CalibrationLabel(txt_joystick_axis_t *joystick_axis) "right, and press the button."; } } + + return NULL; } static void SetCalibrationLabel(txt_joystick_axis_t *joystick_axis) @@ -265,6 +267,8 @@ static int NextCalibrateStage(txt_joystick_axis_t *joystick_axis) case CONFIG_STAGE2: return CONFIG_CENTER; } + + return -1; } static int EventCallback(SDL_Event *event, TXT_UNCAST_ARG(joystick_axis)) |