summaryrefslogtreecommitdiff
path: root/src/deh_main.c
diff options
context:
space:
mode:
authorSimon Howard2008-07-31 20:06:42 +0000
committerSimon Howard2008-07-31 20:06:42 +0000
commit8c7078eca9a086f50002d5b84a0b8e80a9d36070 (patch)
tree087f804b937bd00409c01d45d352dc0ecd5c6f4e /src/deh_main.c
parentec5ca368b7dfa19a485f75a60cc6b0377882562d (diff)
downloadchocolate-doom-8c7078eca9a086f50002d5b84a0b8e80a9d36070.tar.gz
chocolate-doom-8c7078eca9a086f50002d5b84a0b8e80a9d36070.tar.bz2
chocolate-doom-8c7078eca9a086f50002d5b84a0b8e80a9d36070.zip
Automatically load chex.deh on startup if playing in chex mode.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1165
Diffstat (limited to 'src/deh_main.c')
-rw-r--r--src/deh_main.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/deh_main.c b/src/deh_main.c
index 3ace70e5..b70a3384 100644
--- a/src/deh_main.c
+++ b/src/deh_main.c
@@ -351,21 +351,25 @@ static void DEH_ParseContext(deh_context_t *context)
// Parses a dehacked file
-static void DEH_ParseFile(char *filename)
+int DEH_LoadFile(char *filename)
{
deh_context_t *context;
+ printf(" loading %s\n", filename);
+
context = DEH_OpenFile(filename);
if (context == NULL)
{
- fprintf(stderr, "DEH_ParseFile: Unable to open %s\n", filename);
- return;
+ fprintf(stderr, "DEH_LoadFile: Unable to open %s\n", filename);
+ return 0;
}
DEH_ParseContext(context);
DEH_CloseFile(context);
+
+ return 1;
}
// Checks the command line for -deh argument
@@ -393,8 +397,7 @@ void DEH_Init(void)
while (p < myargc && myargv[p][0] != '-')
{
filename = D_TryFindWADByName(myargv[p]);
- printf(" loading %s\n", filename);
- DEH_ParseFile(filename);
+ DEH_LoadFile(filename);
++p;
}
}