summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorJames Haley2012-02-10 02:59:48 +0000
committerJames Haley2012-02-10 02:59:48 +0000
commit4012f2369314d58cc5f567ed10446ef4c17bfab8 (patch)
tree3daa3ea8fbe218ec2617f1d106f5abcd928ec0f4 /src/strife
parenta8df85b3c6c01d4446b307298f34cd886d606c57 (diff)
downloadchocolate-doom-4012f2369314d58cc5f567ed10446ef4c17bfab8.tar.gz
chocolate-doom-4012f2369314d58cc5f567ed10446ef4c17bfab8.tar.bz2
chocolate-doom-4012f2369314d58cc5f567ed10446ef4c17bfab8.zip
Added INTRO-FIXME tags to borked-up intro code.
Subversion-branch: /branches/v2-branch Subversion-revision: 2500
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/d_main.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c
index 0b2b1568..3d423c97 100644
--- a/src/strife/d_main.c
+++ b/src/strife/d_main.c
@@ -1187,6 +1187,15 @@ static void D_InitIntroSequence(void)
// windowed-mode settings. The real settings will be restored
// when the intro screen finishes.
+ // INTRO-FIXME:
+ // This is causing problems on Windows, including interruption of the
+ // sound playing. I would like to see this changed back to how it worked
+ // before and simply disabled during netgames if that's what
+ // is required.
+ // This would require an early checkparm on all of the following:
+ // -server, -privateserver, -autojoin, -connect, -drone
+ // -haleyjd
+
saved_screen_width = screen_width;
saved_screen_height = screen_height;
saved_aspect_ratio_correct = aspect_ratio_correct;
@@ -1196,6 +1205,11 @@ static void D_InitIntroSequence(void)
// makes no sense to switch to a larger window for the splash
// screen, so use the configured settings.
+ // INTRO-FIXME: how does this make sense?
+ // If I have an 800x600 game window, then I want an 800x600 intro too.
+ // Either the logic is off or I simply totally disagree with this.
+ // -haleyjd
+
if (fullscreen
|| screen_width > INTRO_SCREEN_W || screen_height > INTRO_SCREEN_H)
{
@@ -1920,6 +1934,9 @@ void D_DoomMain (void)
// the intro sequence here so that netgame startup can begin.
// The original calls to D_IntroTick() are commented-out below.
+ // INTRO-FIXME: Great in theory but it makes the intro end too quickly.
+ // -haleyjd
+
D_IntroTick();
D_IntroTick();
D_IntroTick();