summaryrefslogtreecommitdiff
path: root/src/doom/d_main.c
diff options
context:
space:
mode:
authorSimon Howard2011-10-22 18:33:37 +0000
committerSimon Howard2011-10-22 18:33:37 +0000
commitd64626ff417323e05a479caeee02168c1eafd798 (patch)
tree277e45c43d42875fb6cb3e3570224977bbc3a48c /src/doom/d_main.c
parentcfd1a3f8f739b049af04b9e637db9a51758cef27 (diff)
parent71d316afb2ae7191a4ef6fac2d757238ae3616e1 (diff)
downloadchocolate-doom-d64626ff417323e05a479caeee02168c1eafd798.tar.gz
chocolate-doom-d64626ff417323e05a479caeee02168c1eafd798.tar.bz2
chocolate-doom-d64626ff417323e05a479caeee02168c1eafd798.zip
Merge from trunk.
Subversion-branch: /branches/v2-branch Subversion-revision: 2458
Diffstat (limited to 'src/doom/d_main.c')
-rw-r--r--src/doom/d_main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index ddc0c7f7..ba542727 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -918,10 +918,12 @@ static void InitGameVersion(void)
else
{
// Final Doom: tnt or plutonia
- // Default to the "alt" version of the executable that
- // fixes the demo loop behavior.
+ // Defaults to emulating the first Final Doom executable,
+ // which has the crash in the demo loop; however, having
+ // this as the default should mean that it plays back
+ // most demos correctly.
- gameversion = exe_final2;
+ gameversion = exe_final;
}
}
}