shithub: choc

Info  •  Files  •  Log  •  Branches

Minor tweaks to get chocolate-hexen to build.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1341

--- a/src/hexen/h2_main.c

+++ b/src/hexen/h2_main.c

@@ -193,8 +193,6 @@

     startmap = 1;

     shareware = false;          // Always false for Hexen

-    HandleArgs();

-

     // Initialize subsystems

     ST_Message("V_Init: allocate screens.\n");

@@ -203,6 +201,7 @@

     // 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();

@@ -209,17 +208,12 @@

     // 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 @@

     I_StartupJoystick();

 #endif

+    HandleArgs();

+

     ST_Message("MN_Init: Init menu system.\n");

     MN_Init();

@@ -355,9 +351,6 @@

             opt->func(&myargv[p], opt->tag);

         }

     }

-

-    // Look for an external device driver

-    I_CheckExternDriver();

 }

 //==========================================================================

--- a/src/hexen/p_inter.c

+++ b/src/hexen/p_inter.c

@@ -83,7 +83,7 @@

     {

         strcpy(player->message, message);

     }

-    strupr(player->message);

+//    strupr(player->message);

     player->messageTics = MESSAGETICS;

     player->yellowMessage = false;

     if (ultmsg)