summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2005-10-04 00:41:49 +0000
committerSimon Howard2005-10-04 00:41:49 +0000
commite98e86a672d7f1548c57a1b3351b1aacb60d9e03 (patch)
treecf2838202f0b2bc485b6216e45f1d36ad70fdfcd
parent4dfffeb54db996c6ea0e52e1707633b80a581f2e (diff)
downloadchocolate-doom-e98e86a672d7f1548c57a1b3351b1aacb60d9e03.tar.gz
chocolate-doom-e98e86a672d7f1548c57a1b3351b1aacb60d9e03.tar.bz2
chocolate-doom-e98e86a672d7f1548c57a1b3351b1aacb60d9e03.zip
Move call to dehacked entrypoint to stop crashes
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 161
-rw-r--r--src/d_main.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/d_main.c b/src/d_main.c
index 23d9b9af..e88d6d49 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: d_main.c 153 2005-10-02 23:49:01Z fraggle $
+// $Id: d_main.c 161 2005-10-04 00:41:49Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.18 2005/10/04 00:41:49 fraggle
+// Move call to dehacked entrypoint to stop crashes
+//
// Revision 1.17 2005/10/02 23:49:01 fraggle
// The beginnings of dehacked support
//
@@ -93,7 +96,7 @@
//-----------------------------------------------------------------------------
-static const char rcsid[] = "$Id: d_main.c 153 2005-10-02 23:49:01Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 161 2005-10-04 00:41:49Z fraggle $";
#define BGCOLOR 7
#define FGCOLOR 8
@@ -1168,6 +1171,8 @@ void D_DoomMain (void)
printf ("ST_Init: Init status bar.\n");
ST_Init ();
+ DEH_CheckCommandLine();
+
// start the apropriate game based on parms
p = M_CheckParm ("-record");
@@ -1212,7 +1217,5 @@ void D_DoomMain (void)
}
- DEH_CheckCommandLine();
-
D_DoomLoop (); // never returns
}