summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/d_main.c12
-rw-r--r--src/deh_main.c8
-rw-r--r--src/deh_main.h8
3 files changed, 20 insertions, 8 deletions
diff --git a/src/d_main.c b/src/d_main.c
index 6941d6b8..efda9f24 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: d_main.c 204 2005-10-16 20:55:50Z fraggle $
+// $Id: d_main.c 214 2005-10-17 23:48:05Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.30 2005/10/17 23:48:05 fraggle
+// DEH_CheckCommandLine -> DEH_Init, for consistency with other Init
+// functions
+//
// Revision 1.29 2005/10/16 20:55:50 fraggle
// Fix the '-cdrom' command-line option.
//
@@ -133,7 +137,7 @@
//-----------------------------------------------------------------------------
-static const char rcsid[] = "$Id: d_main.c 204 2005-10-16 20:55:50Z fraggle $";
+static const char rcsid[] = "$Id: d_main.c 214 2005-10-17 23:48:05Z fraggle $";
#define BGCOLOR 7
#define FGCOLOR 8
@@ -1254,8 +1258,8 @@ void D_DoomMain (void)
Z_Init ();
#ifdef FEATURE_DEHACKED
- printf("DEH_CheckCommandLine: Init Dehacked support.\n");
- DEH_CheckCommandLine();
+ printf("DEH_Init: Init Dehacked support.\n");
+ DEH_Init();
#endif
printf ("W_Init: Init WADfiles.\n");
diff --git a/src/deh_main.c b/src/deh_main.c
index 2c0868ed..3dd95ec5 100644
--- a/src/deh_main.c
+++ b/src/deh_main.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_main.c 213 2005-10-17 23:16:09Z fraggle $
+// $Id: deh_main.c 214 2005-10-17 23:48:05Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.9 2005/10/17 23:48:05 fraggle
+// DEH_CheckCommandLine -> DEH_Init, for consistency with other Init
+// functions
+//
// Revision 1.8 2005/10/17 23:16:09 fraggle
// Add a "loading" message for each dehacked patch we load, to be orthogonal
// to the WAD loading code
@@ -329,7 +333,7 @@ static void DEH_ParseFile(char *filename)
// Checks the command line for -deh argument
-void DEH_CheckCommandLine(void)
+void DEH_Init(void)
{
int argc;
diff --git a/src/deh_main.h b/src/deh_main.h
index 7c78f15e..982bb14c 100644
--- a/src/deh_main.h
+++ b/src/deh_main.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_main.h 190 2005-10-12 21:52:01Z fraggle $
+// $Id: deh_main.h 214 2005-10-17 23:48:05Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,10 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.4 2005/10/17 23:48:05 fraggle
+// DEH_CheckCommandLine -> DEH_Init, for consistency with other Init
+// functions
+//
// Revision 1.3 2005/10/12 21:52:01 fraggle
// doomfeatures.h to allow certain features to be disabled in the build
//
@@ -43,7 +47,7 @@
#include "doomtype.h"
#include "doomfeatures.h"
-void DEH_CheckCommandLine(void);
+void DEH_Init(void);
boolean DEH_ParseAssignment(char *line, char **variable_name, char **value);