summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2008-12-10 01:01:19 +0000
committerSimon Howard2008-12-10 01:01:19 +0000
commit08522e4bcff0f552fa0392102e73591e58822524 (patch)
tree221e8e25eb3d0fab31d2c89a22627ac210f4f1e9
parentaed280e13947099544f584077e9cd893ddeaf9e5 (diff)
downloadchocolate-doom-08522e4bcff0f552fa0392102e73591e58822524.tar.gz
chocolate-doom-08522e4bcff0f552fa0392102e73591e58822524.tar.bz2
chocolate-doom-08522e4bcff0f552fa0392102e73591e58822524.zip
Undo previous change.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1417
-rw-r--r--setup/mainmenu.c6
-rw-r--r--src/i_system.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index 55341c81..d4dfe0db 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -193,15 +193,15 @@ static void RunGUI(void)
{
SetDisplayDriver();
- TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);
- SetIcon();
-
if (!TXT_Init())
{
fprintf(stderr, "Failed to initialise GUI\n");
exit(-1);
}
+ TXT_SetDesktopTitle(PACKAGE_NAME " Setup ver " PACKAGE_VERSION);
+ SetIcon();
+
MainMenu();
TXT_GUIMainLoop();
diff --git a/src/i_system.c b/src/i_system.c
index 282000ed..fe596a60 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -139,15 +139,15 @@ void I_Endoom(void)
endoom_data = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC);
+ // Set up text mode screen
+
+ TXT_Init();
+
// Make sure the new window has the right title and icon
I_SetWindowCaption();
I_SetWindowIcon();
- // Set up text mode screen
-
- TXT_Init();
-
// Write the data to the screen memory
screendata = TXT_GetScreenData();