summaryrefslogtreecommitdiff
path: root/apps/plugins/doom/d_main.c
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2007-06-03 22:03:36 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2007-06-03 22:03:36 +0000
commitaec5814d436f6307dc3e6a1a09aa1ffec5709c27 (patch)
tree9d553317483ec7ef53dca7db931bd9f99ca7a5b8 /apps/plugins/doom/d_main.c
parent7428b79de328dca03274ccfe08d59636eb6f8d51 (diff)
downloadrockbox-aec5814d436f6307dc3e6a1a09aa1ffec5709c27.zip
rockbox-aec5814d436f6307dc3e6a1a09aa1ffec5709c27.tar.gz
rockbox-aec5814d436f6307dc3e6a1a09aa1ffec5709c27.tar.bz2
rockbox-aec5814d436f6307dc3e6a1a09aa1ffec5709c27.tar.xz
Some fixes to doom dehacked loading - make embedded dehacked files actually load, fix end of file detection in the string loader, fix ammo changes, fix bex code pointers. Also added the * flag to sscanf - still only tested against rockdoom sscanf calls.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13547 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/doom/d_main.c')
-rw-r--r--apps/plugins/doom/d_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/doom/d_main.c b/apps/plugins/doom/d_main.c
index 3dc6487..32e3809 100644
--- a/apps/plugins/doom/d_main.c
+++ b/apps/plugins/doom/d_main.c
@@ -82,7 +82,7 @@ boolean clfastparm; // checkparm of -fast
boolean nomonsters; // working -nomonsters
boolean respawnparm; // working -respawn
boolean fastparm; // working -fast
-boolean dehout=false;
+boolean dehout=true;
boolean singletics = false; // debug flag to cancel adaptiveness
@@ -731,7 +731,7 @@ void D_DoomMainSetup(void)
W_Init();
if ((p = W_CheckNumForName("DEHACKED")) != -1) // cph - add dehacked-in-a-wad support
- ProcessDehFile(NULL, dehout ? NULL : "/dehlog.txt", p);
+ ProcessDehFile(NULL, dehout ? "/dehlog.txt" : NULL, p);
V_InitColorTranslation(); //jff 4/24/98 load color translation lumps