commit fb176d6121a9313cd98cd015045d239ddfef3994
Merge: 350fe185 5bab2a78
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Tue Sep 23 23:12:03 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Tue Sep 23 23:12:03 2008 +0000
Merge updates from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1266
codeblocks/game.cbp | 10 ++++++++--
codeblocks/libpcsound.cbp | 2 +-
codeblocks/server.cbp | 2 +-
codeblocks/setup.cbp | 9 ++++++++-
codeblocks/textscreen.cbp | 3 ++-
src/doom/d_main.c | 2 +-
src/doom/deh_cheat.c | 10 ++++++++--
src/doom/deh_io.c | 13 ++++++-------
src/doom/deh_main.c | 15 +++++++++++++++
src/doom/deh_main.h | 1 +
src/i_main.c | 18 ++++++++++++++++--
11 files changed, 67 insertions(+), 18 deletions(-)
diff --cc src/doom/deh_main.h
index 8a0587ff,6afe07f3..f9cb44ca
--- a/src/doom/deh_main.h
+++ b/src/doom/deh_main.h
@@@ -46,8 -45,23 +46,9 @@@ boolean DEH_ParseAssignment(char *line
void DEH_Checksum(md5_digest_t digest);
-// deh_text.c:
-//
-// Used to do dehacked text substitutions throughout the program
-
-#ifdef FEATURE_DEHACKED
-
-char *DEH_String(char *s);
-
-#else
-
-#define DEH_String(x) (x)
-
-#endif
-
extern boolean deh_allow_long_strings;
extern boolean deh_allow_long_cheats;
+ extern boolean deh_apply_cheats;
#endif /* #ifndef DEH_MAIN_H */
diff --cc src/i_main.c
index ac4a68e3,74b164b1..4efd2cd9
--- a/src/i_main.c
+++ b/src/i_main.c
@@@ -32,19 -32,15 +32,22 @@@
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+ #else
+ #include <unistd.h>
+ #include <sched.h>
#endif
-#include "doomdef.h"
+#include "doomtype.h"
#include "i_system.h"
#include "m_argv.h"
-#include "d_main.h"
+
+//
+// D_DoomMain()
+// Not a globally visible function, just included for source reference,
+// calls all startup code, parses command line options.
+//
+
+void D_DoomMain (void);
int main(int argc, char **argv)
{