summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Howard2015-05-12 09:07:29 -0400
committerSimon Howard2015-05-12 09:07:29 -0400
commitd1bfae16981023899c7703ec5004655cd6f0ffaf (patch)
tree79130294def3eafa902b70cb9f4100fd92f0ebac /src
parentb3678129fd7bed6c3287ab682819b075e8bf495a (diff)
parent81c69106b287db38fe93a2855a66baef9f7ca9d7 (diff)
downloadchocolate-doom-d1bfae16981023899c7703ec5004655cd6f0ffaf.tar.gz
chocolate-doom-d1bfae16981023899c7703ec5004655cd6f0ffaf.tar.bz2
chocolate-doom-d1bfae16981023899c7703ec5004655cd6f0ffaf.zip
Merge pull request #542 from chungy/final2_sky_fix
doom: the sky changes in final2 map11->12 and map20->21 transitions.
Diffstat (limited to 'src')
-rw-r--r--src/doom/g_game.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/doom/g_game.c b/src/doom/g_game.c
index 64f5b274..bc582a52 100644
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -612,6 +612,30 @@ void G_DoLoadLevel (void)
skyflatnum = R_FlatNumForName(DEH_String(SKYFLATNAME));
+ // The "Sky never changes in Doom II" bug was fixed in
+ // the id Anthology version of doom2.exe for Final Doom.
+ if ((gamemode == commercial) && (gameversion == exe_final2))
+ {
+ char *skytexturename;
+
+ if (gamemap < 12)
+ {
+ skytexturename = "SKY1";
+ }
+ else if (gamemap < 21)
+ {
+ skytexturename = "SKY2";
+ }
+ else
+ {
+ skytexturename = "SKY3";
+ }
+
+ skytexturename = DEH_String(skytexturename);
+
+ skytexture = R_TextureNumForName(skytexturename);
+ }
+
levelstarttic = gametic; // for time calculation
if (wipegamestate == GS_LEVEL)