summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2011-09-20 20:47:19 +0000
committerSimon Howard2011-09-20 20:47:19 +0000
commit4fba2ab2ddda75a05c70ac95531504edfafdf8c8 (patch)
tree84c124abfd401fec865e2fdbb5c0006962e48e67 /src
parente5336a1bdc44021605c20f9c50876b6cb5c90f9a (diff)
downloadchocolate-doom-4fba2ab2ddda75a05c70ac95531504edfafdf8c8.tar.gz
chocolate-doom-4fba2ab2ddda75a05c70ac95531504edfafdf8c8.tar.bz2
chocolate-doom-4fba2ab2ddda75a05c70ac95531504edfafdf8c8.zip
Add TXT_MessageBox convenience function.
Subversion-branch: /branches/v2-branch Subversion-revision: 2388
Diffstat (limited to 'src')
-rw-r--r--src/setup/joystick.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/setup/joystick.c b/src/setup/joystick.c
index 48074121..064ff99d 100644
--- a/src/setup/joystick.c
+++ b/src/setup/joystick.c
@@ -270,19 +270,9 @@ static int CalibrationEventCallback(SDL_Event *event, void *user_data)
static void NoJoystick(void)
{
- txt_window_t *window;
-
- window = TXT_NewWindow(NULL);
-
- TXT_AddWidget(window,
- TXT_NewLabel("No joysticks could be opened.\n\n"
- "Try configuring your joystick from within\n"
- "your OS first."));
-
- TXT_SetWindowAction(window, TXT_HORIZ_LEFT, NULL);
- TXT_SetWindowAction(window, TXT_HORIZ_CENTER,
- TXT_NewWindowEscapeAction(window));
- TXT_SetWindowAction(window, TXT_HORIZ_RIGHT, NULL);
+ TXT_MessageBox(NULL, "No joysticks could be opened.\n\n"
+ "Try configuring your joystick from within\n"
+ "your OS first.");
joystick_index = -1;
SetJoystickButtonLabel();