summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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();
}