summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2011-04-24 21:39:31 +0000
committerSimon Howard2011-04-24 21:39:31 +0000
commit9f4221bf92510f417bb9263031ca4f18db10e54f (patch)
treed82f6e335d0b6c942c4f50bb0bdf43fa2a2a4b3f
parent4511434446e523a5e2a7383b14846df2b91df8f1 (diff)
downloadchocolate-doom-9f4221bf92510f417bb9263031ca4f18db10e54f.tar.gz
chocolate-doom-9f4221bf92510f417bb9263031ca4f18db10e54f.tar.bz2
chocolate-doom-9f4221bf92510f417bb9263031ca4f18db10e54f.zip
Add test button to joystick menu in setup tool (thanks Alexandre
Xavier). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2329
-rw-r--r--NEWS2
-rw-r--r--setup/joystick.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 8a66fb2b..8569bfd7 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@
* In the setup tool, it is now possible to hold down shift when
changing key/mouse/joystick bindings to prevent other bindings
to the same key from being cleared (thanks myk).
+ * The joystick menu in the setup tool now has a test button
+ (thanks Alexandre Xavier).
Compatibility:
* Added support for the alternate version of the Final Doom
diff --git a/setup/joystick.c b/setup/joystick.c
index fe87439c..5d2dfd68 100644
--- a/setup/joystick.c
+++ b/setup/joystick.c
@@ -25,6 +25,7 @@
#include "textscreen.h"
#include "txt_joybinput.h"
+#include "execute.h"
#include "joystick.h"
typedef enum
@@ -438,6 +439,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();
}