diff options
| author | Simon Howard | 2011-06-13 22:21:37 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-06-13 22:21:37 +0000 |
| commit | 391e7466b1efb7cbede4a1c356a210d9e7ee616b (patch) | |
| tree | 90d13346d9cd3636df44290ded13d59ae3712543 /src/setup/joystick.c | |
| parent | fa328faf056affa216f2f3a8764ca0d56262efe9 (diff) | |
| parent | 822664b4ff873d462370e9e96a9d91e6066c221d (diff) | |
| download | chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.gz chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.tar.bz2 chocolate-doom-391e7466b1efb7cbede4a1c356a210d9e7ee616b.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2347
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 0fc00ea1..2a7b1f79 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(); } |