diff options
| author | Simon Howard | 2011-09-11 23:40:44 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-09-11 23:40:44 +0000 |
| commit | efd15d965dee947a04727bb62f4e2092cf28732f (patch) | |
| tree | 730d99c1e88d5e3145e552ad69dec52d30026d01 /src/setup/joystick.c | |
| parent | 4d17ab361e90a75dc6deefd37e6eb2ba0610b386 (diff) | |
| parent | 11024d8214580d63ca7a9e70a121f5ff542a2fce (diff) | |
| download | chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.gz chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.tar.bz2 chocolate-doom-efd15d965dee947a04727bb62f4e2092cf28732f.zip | |
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2367
Diffstat (limited to 'src/setup/joystick.c')
| -rw-r--r-- | src/setup/joystick.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c index 9c6b5851..48074121 100644 --- a/src/setup/joystick.c +++ b/src/setup/joystick.c @@ -27,6 +27,7 @@ #include "m_controls.h" #include "textscreen.h" +#include "execute.h" #include "joystick.h" #include "mode.h" #include "txt_joybinput.h" @@ -436,6 +437,8 @@ void ConfigJoystick(void) TXT_SignalConnect(joystick_button, "pressed", CalibrateJoystick, NULL); TXT_SignalConnect(window, "closed", JoystickWindowClosed, NULL); + TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction()); + SetJoystickButtonLabel(); } |