[chocolate-doom] 11/26: Rearrange the order of startup code to allow replacing the IWAD filename via dehacked

[Jonathan Dowland]

This is an automated email from the git hooks/post-receive script.

jmtd pushed a commit to annotated tag chocolate-doom-0.1.4
in repository chocolate-doom.

commit c685debfd4f9f24952a1d7a063959413af5c890a
Author: Simon Howard <fraggle at gmail.com>
Date:   Mon Jan 23 00:47:22 2006 +0000

    Rearrange the order of startup code to allow replacing the IWAD filename
    via dehacked
    
    Subversion-branch: /branches/CHOCOLATE_DOOM_0_1/chocolate-doom
    Subversion-revision: 337
---
 src/d_main.c | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 358bd1c..179bc80 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*- 
 //-----------------------------------------------------------------------------
 //
-// $Id: d_main.c 315 2006-01-22 21:19:00Z fraggle $
+// $Id: d_main.c 337 2006-01-23 00:47:22Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
 // 02111-1307, USA.
 //
 // $Log$
+// Revision 1.39.2.3  2006/01/23 00:47:22  fraggle
+// Rearrange the order of startup code to allow replacing the IWAD filename via dehacked
+//
 // Revision 1.39.2.2  2006/01/22 21:19:00  fraggle
 // Dehacked string replacements for startup messages, IWAD names, demo names and backgrounds
 //
@@ -179,7 +182,7 @@
 //-----------------------------------------------------------------------------
 
 
-static const char rcsid[] = "$Id: d_main.c 315 2006-01-22 21:19:00Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 337 2006-01-23 00:47:22Z fraggle $";
 
 #define	BGCOLOR		7
 #define	FGCOLOR		8
@@ -1350,6 +1353,18 @@ void D_DoomMain (void)
 
     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);
@@ -1364,10 +1379,6 @@ void D_DoomMain (void)
     else if (M_CheckParm ("-deathmatch"))
 	deathmatch = 1;
 
-    // print banner
-
-    PrintBanner(PACKAGE_STRING);
-
     if (devparm)
 	printf(DEH_String(D_DEVSTR));
     
@@ -1458,14 +1469,6 @@ void D_DoomMain (void)
     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);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git