shithub: choc

Download patch

ref: 2e86d1db221b74df8de8cbdf329eb3aff6146869
parent: 6e746bd6b45259360c61e5e3aa8f96a0f639d15b
parent: e8ad50b8fb2c69710f945a5bdfe2cf046f535261
author: Fabian Greffrath <fabian@greffrath.com>
date: Wed Jul 10 16:13:02 EDT 2019 

Merge pull request #1172 from mfrancis95/master

Always try to load SKY3 when starting a new game in Doom II (resolve …


--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -1866,12 +1866,13 @@
 
     if (gamemode == commercial)
     {
-        if (gamemap < 12)
-            skytexturename = "SKY1";
-        else if (gamemap < 21)
-            skytexturename = "SKY2";
-        else
-            skytexturename = "SKY3";
+        skytexturename = DEH_String("SKY3");
+        skytexture = R_TextureNumForName(skytexturename);
+        if (gamemap < 21)
+        {
+            skytexturename = DEH_String(gamemap < 12 ? "SKY1" : "SKY2");
+            skytexture = R_TextureNumForName(skytexturename);
+        }
     }
     else
     {
@@ -1891,12 +1892,9 @@
             skytexturename = "SKY4";
             break;
         }
+        skytexturename = DEH_String(skytexturename);
+        skytexture = R_TextureNumForName(skytexturename);
     }
-
-    skytexturename = DEH_String(skytexturename);
-
-    skytexture = R_TextureNumForName(skytexturename);
-
 
     G_DoLoadLevel ();
 }