From f75d8a50c100c58b040dded819d6290829037a63 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 8 Oct 2008 19:12:51 +0000
Subject: Minor tweaks to get chocolate-hexen to build.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1341
---
 src/hexen/h2_main.c | 17 +++++------------
 src/hexen/p_inter.c |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index 9d83a7da..4bdcc7d5 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -193,8 +193,6 @@ void D_DoomMain(void)
     startmap = 1;
     shareware = false;          // Always false for Hexen
 
-    HandleArgs();
-
     // Initialize subsystems
 
     ST_Message("V_Init: allocate screens.\n");
@@ -203,23 +201,19 @@ void D_DoomMain(void)
     // Load defaults before initing other systems
     ST_Message("M_LoadDefaults: Load system defaults.\n");
     D_BindVariables();
+    M_SetConfigDir();
     M_SetConfigFilenames("hexen.cfg", PROGRAM_PREFIX "hexen.cfg");
     M_LoadDefaults();
 
     // Now that the savedir is loaded from .CFG, make sure it exists
     CreateSavePath();
 
-    // HEXEN MODIFICATION:
-    // There is a realloc() in W_AddFile() that might fail if the zone
-    // heap has been previously allocated, so we need to initialize the
-    // WAD files BEFORE the zone memory initialization.
-    ST_Message("W_Init: Init WADfiles.\n");
-    W_InitMultipleFiles(wadfiles);
-
 #ifdef TIMEBOMB
     DoTimeBomb();
 #endif
 
+//    ST_Message("W_Init: Init WADfiles.\n");
+
     ST_Message("Z_Init: Init zone memory allocation daemon.\n");
     Z_Init();
 
@@ -228,6 +222,8 @@ void D_DoomMain(void)
     I_StartupJoystick();
 #endif
 
+    HandleArgs();
+
     ST_Message("MN_Init: Init menu system.\n");
     MN_Init();
 
@@ -355,9 +351,6 @@ static void HandleArgs(void)
             opt->func(&myargv[p], opt->tag);
         }
     }
-
-    // Look for an external device driver
-    I_CheckExternDriver();
 }
 
 //==========================================================================
diff --git a/src/hexen/p_inter.c b/src/hexen/p_inter.c
index 45ce3cd3..1f57912e 100644
--- a/src/hexen/p_inter.c
+++ b/src/hexen/p_inter.c
@@ -83,7 +83,7 @@ void P_SetMessage(player_t * player, char *message, boolean ultmsg)
     {
         strcpy(player->message, message);
     }
-    strupr(player->message);
+//    strupr(player->message);
     player->messageTics = MESSAGETICS;
     player->yellowMessage = false;
     if (ultmsg)
-- 
cgit v1.2.3