summaryrefslogtreecommitdiff
path: root/src/deh_main.h
diff options
context:
space:
mode:
authorSimon Howard2005-10-12 21:52:01 +0000
committerSimon Howard2005-10-12 21:52:01 +0000
commitb9a5732a74152bf8ee21e86fc23fe43d3b235f4c (patch)
tree663020b176dfaaf0e295f2186a124080c3b5ca2f /src/deh_main.h
parent859fc3d3db9665a907ab8b52aa53b3adc681ae5d (diff)
downloadchocolate-doom-b9a5732a74152bf8ee21e86fc23fe43d3b235f4c.tar.gz
chocolate-doom-b9a5732a74152bf8ee21e86fc23fe43d3b235f4c.tar.bz2
chocolate-doom-b9a5732a74152bf8ee21e86fc23fe43d3b235f4c.zip
doomfeatures.h to allow certain features to be disabled in the build
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 190
Diffstat (limited to 'src/deh_main.h')
-rw-r--r--src/deh_main.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/deh_main.h b/src/deh_main.h
index 8a2b3721..7c78f15e 100644
--- a/src/deh_main.h
+++ b/src/deh_main.h
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: deh_main.h 160 2005-10-03 21:39:39Z fraggle $
+// $Id: deh_main.h 190 2005-10-12 21:52:01Z fraggle $
//
// Copyright(C) 2005 Simon Howard
//
@@ -21,6 +21,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.3 2005/10/12 21:52:01 fraggle
+// doomfeatures.h to allow certain features to be disabled in the build
+//
// Revision 1.2 2005/10/03 21:39:39 fraggle
// Dehacked text substitutions
//
@@ -38,6 +41,7 @@
#define DEH_MAIN_H
#include "doomtype.h"
+#include "doomfeatures.h"
void DEH_CheckCommandLine(void);
@@ -47,7 +51,15 @@ boolean DEH_ParseAssignment(char *line, char **variable_name, char **value);
//
// Used to do dehacked text substitutions throughout the program
+#ifdef FEATURE_DEHACKED
+
char *DEH_String(char *s);
+#else
+
+#define DEH_String(x) (x)
+
+#endif
+
#endif /* #ifndef DEH_MAIN_H */