shithub: choc

Download patch

ref: 9f4221bf92510f417bb9263031ca4f18db10e54f
parent: 4511434446e523a5e2a7383b14846df2b91df8f1
author: Simon Howard <[email protected]>
date: Sun Apr 24 17:39:31 EDT 2011

Add test button to joystick menu in setup tool (thanks Alexandre
Xavier).

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2329

--- 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
--- 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
@@ -437,6 +438,8 @@
 
     TXT_SignalConnect(joystick_button, "pressed", CalibrateJoystick, NULL);
     TXT_SignalConnect(window, "closed", JoystickWindowClosed, NULL);
+
+    TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
 
     SetJoystickButtonLabel();
 }