setup: Change labelling to clarify gamepad support.

Vanilla Doom's setup.exe only made reference to "joysticks" as back
then gamepads were relatively uncommon for PCs and ports for game
controllers canonically known as "joystick ports". Nowadays it's far
more likely (and ergonomic) that the player will be using a gamepad
than a joystick. Change the labelling to refer to "Gamepad/Joystick"
or "controller" instead.

2 files changed, 19 insertions, 18 deletions

diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index 23cbaa4a..fcb907a0 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -180,15 +180,15 @@ static void SetCalibrationLabel(void)
     switch (calibrate_stage)
     {
         case CALIBRATE_CENTER:
-            message = "Move the joystick to the\n"
+            message = "Move the D-pad or joystick to the\n"
                       "center, and press a button.";
             break;
         case CALIBRATE_UP:
-            message = "Move the joystick up,\n"
+            message = "Push the D-pad or joystick up,\n"
                       "and press a button.";
             break;
         case CALIBRATE_LEFT:
-            message = "Move the joystick to the\n"
+            message = "Push the D-pad or joystick to the\n"
                       "left, and press a button.";
             break;
     }
@@ -276,9 +276,10 @@ static int CalibrationEventCallback(SDL_Event *event, void *user_data)
 
 static void NoJoystick(void)
 {
-    TXT_MessageBox(NULL, "No joysticks could be opened.\n\n"
-                         "Try configuring your joystick from within\n"
-                         "your OS first.");
+    TXT_MessageBox(NULL, "No joysticks or gamepads could be found.\n\n"
+                         "Try configuring your controller from within\n"
+                         "your OS first. Maybe you need to install\n"
+                         "some drivers or otherwise configure it.");
 
     joystick_index = -1;
     SetJoystickButtonLabel();
@@ -304,11 +305,11 @@ static void CalibrateJoystick(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
         return;
     }
 
-    calibration_window = TXT_NewWindow("Joystick calibration");
+    calibration_window = TXT_NewWindow("Gamepad/Joystick calibration");
 
-    TXT_AddWidgets(calibration_window, 
+    TXT_AddWidgets(calibration_window,
                    TXT_NewLabel("Please follow the following instructions\n"
-                                "in order to calibrate your joystick."),
+                                "in order to calibrate your controller."),
                    TXT_NewStrut(0, 1),
                    calibration_label = TXT_NewLabel("zzz"),
                    TXT_NewStrut(0, 1),
@@ -388,19 +389,19 @@ void ConfigJoystick(void)
         joystick_initted = SDL_Init(SDL_INIT_JOYSTICK) >= 0;
     }
 
-    window = TXT_NewWindow("Joystick configuration");
+    window = TXT_NewWindow("Gamepad/Joystick configuration");
 
     TXT_AddWidgets(window,
-                   TXT_NewCheckBox("Enable joystick", &usejoystick),
+                   TXT_NewCheckBox("Enable gamepad/joystick", &usejoystick),
                    joystick_table = TXT_NewTable(2),
-                   TXT_NewSeparator("Joystick buttons"),
+                   TXT_NewSeparator("Buttons"),
                    button_table = TXT_NewTable(2),
                    NULL);
 
     TXT_SetColumnWidths(joystick_table, 20, 15);
 
     TXT_AddWidgets(joystick_table,
-                   TXT_NewLabel("Current joystick"),
+                   TXT_NewLabel("Current controller"),
                    joystick_button = TXT_NewButton("zzzz"),
                    NULL);
 
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index c777edfa..5b085065 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -217,15 +217,15 @@ void MainMenu(void)
     window = TXT_NewWindow("Main Menu");
 
     TXT_AddWidgets(window,
-          TXT_NewButton2("Configure Display", 
+          TXT_NewButton2("Configure Display",
                          (TxtWidgetSignalFunc) ConfigDisplay, NULL),
-          TXT_NewButton2("Configure Sound", 
+          TXT_NewButton2("Configure Sound",
                          (TxtWidgetSignalFunc) ConfigSound, NULL),
-          TXT_NewButton2("Configure Keyboard", 
+          TXT_NewButton2("Configure Keyboard",
                          (TxtWidgetSignalFunc) ConfigKeyboard, NULL),
-          TXT_NewButton2("Configure Mouse", 
+          TXT_NewButton2("Configure Mouse",
                          (TxtWidgetSignalFunc) ConfigMouse, NULL),
-          TXT_NewButton2("Configure Joystick", 
+          TXT_NewButton2("Configure Gamepad/Joystick",
                          (TxtWidgetSignalFunc) ConfigJoystick, NULL),
           NULL);