shithub: choc

Download patch

ref: 8e611a519819a2a64d6562735d250abaf1b19ce5
parent: a9a551bdcc08d10de8f8f526b66e042c30486cf3
author: Simon Howard <fraggle@gmail.com>
date: Sun Jan 22 19:47:16 EST 2006 

Rearrange the order of startup code to allow replacing the IWAD filename
via dehacked

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 336


--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 316 2006-01-22 21:19:14Z fraggle $
+// $Id: d_main.c 336 2006-01-23 00:47:16Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.41  2006/01/23 00:47:16  fraggle
+// Rearrange the order of startup code to allow replacing the IWAD filename via dehacked
+//
 // Revision 1.40  2006/01/22 21:19:14  fraggle
 // Dehacked string replacements for startup messages, IWAD names, demo names and backgrounds
 //
@@ -176,7 +179,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 316 2006-01-22 21:19:14Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 336 2006-01-23 00:47:16Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -1348,6 +1351,18 @@
 
     FindResponseFile ();
 	
+    // print banner
+
+    PrintBanner(PACKAGE_STRING);
+
+    printf (DEH_String("Z_Init: Init zone memory allocation daemon. \n"));
+    Z_Init ();
+
+#ifdef FEATURE_DEHACKED
+    printf("DEH_Init: Init Dehacked support.\n");
+    DEH_Init();
+#endif
+
     FindIWAD ();
 	
     setbuf (stdout, NULL);
@@ -1362,10 +1377,6 @@
     else if (M_CheckParm ("-deathmatch"))
 	deathmatch = 1;
 
-    // print banner
-
-    PrintBanner(PACKAGE_STRING);
-
     if (devparm)
 	printf(DEH_String(D_DEVSTR));
     
@@ -1455,14 +1466,6 @@
 
     printf (DEH_String("M_LoadDefaults: Load system defaults.\n"));
     M_LoadDefaults ();              // load before initing other systems
-
-    printf (DEH_String("Z_Init: Init zone memory allocation daemon. \n"));
-    Z_Init ();
-
-#ifdef FEATURE_DEHACKED
-    printf("DEH_Init: Init Dehacked support.\n");
-    DEH_Init();
-#endif
 
     printf (DEH_String("W_Init: Init WADfiles.\n"));
     W_InitMultipleFiles (wadfiles);