diff options
| author | Simon Howard | 2011-02-24 20:55:54 +0000 |
|---|---|---|
| committer | Simon Howard | 2011-02-24 20:55:54 +0000 |
| commit | b24a72cfd68ccf06ab86a70356f5c6df87bd9eb6 (patch) | |
| tree | 773528c129869b4613188dfdebe2d2f823d20bcc | |
| parent | 8bf9496eeb4b9b32f1863cd10765b31f80bb971c (diff) | |
| download | chocolate-doom-b24a72cfd68ccf06ab86a70356f5c6df87bd9eb6.tar.gz chocolate-doom-b24a72cfd68ccf06ab86a70356f5c6df87bd9eb6.tar.bz2 chocolate-doom-b24a72cfd68ccf06ab86a70356f5c6df87bd9eb6.zip | |
Load response files from main() before calling D_DoomMain, so that all
executables load response files, including the setup tool.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2276
| -rw-r--r-- | src/doom/d_main.c | 2 | ||||
| -rw-r--r-- | src/heretic/d_main.c | 1 | ||||
| -rw-r--r-- | src/hexen/h2_main.c | 1 | ||||
| -rw-r--r-- | src/i_main.c | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/src/doom/d_main.c b/src/doom/d_main.c index 2f116f1e..991907fa 100644 --- a/src/doom/d_main.c +++ b/src/doom/d_main.c @@ -1100,8 +1100,6 @@ void D_DoomMain (void) I_AtExit(D_Endoom, false); - M_FindResponseFile (); - // print banner I_PrintBanner(PACKAGE_STRING); diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c index 169a86ea..5c2d5cf2 100644 --- a/src/heretic/d_main.c +++ b/src/heretic/d_main.c @@ -805,7 +805,6 @@ void D_DoomMain(void) I_AtExit(D_Endoom, false); - M_FindResponseFile(); nomonsters = M_CheckParm("-nomonsters"); respawnparm = M_CheckParm("-respawn"); ravpic = M_CheckParm("-ravpic"); diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c index abc58f15..4f9fe312 100644 --- a/src/hexen/h2_main.c +++ b/src/hexen/h2_main.c @@ -232,7 +232,6 @@ void D_DoomMain(void) int p; I_AtExit(D_HexenQuitMessage, false); - M_FindResponseFile(); startepisode = 1; autostart = false; startskill = sk_medium; diff --git a/src/i_main.c b/src/i_main.c index 1ccc52c0..fdfa3cbc 100644 --- a/src/i_main.c +++ b/src/i_main.c @@ -154,6 +154,8 @@ int main(int argc, char **argv) LockCPUAffinity(); + M_FindResponseFile(); + // start doom D_DoomMain (); |