Merge pull request #1172 from mfrancis95/master

Always try to load SKY3 when starting a new game in Doom II (resolve …
chocolate-doom · Jul 10, 2019 · 2e86d1d · 2e86d1d
2 parents 6e746bd + e8ad50b
commit 2e86d1d
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/doom/g_game.c b/src/doom/g_game.c
@@ -1866,12 +1866,13 @@ G_InitNew
 
     if (gamemode == commercial)
     {
-        if (gamemap < 12)
+        skytexturename = DEH_String("SKY3");
-            skytexturename = "SKY1";
+        skytexture = R_TextureNumForName(skytexturename);
-        else if (gamemap < 21)
+        if (gamemap < 21)
-            skytexturename = "SKY2";
+        {
-        else
+            skytexturename = DEH_String(gamemap < 12 ? "SKY1" : "SKY2");
-            skytexturename = "SKY3";
+            skytexture = R_TextureNumForName(skytexturename);
+        }
     }
     else
     {
@@ -1891,13 +1892,10 @@ G_InitNew
             skytexturename = "SKY4";
             break;
         }
+        skytexturename = DEH_String(skytexturename);
+        skytexture = R_TextureNumForName(skytexturename);
     }
 
-    skytexturename = DEH_String(skytexturename);
-
-    skytexture = R_TextureNumForName(skytexturename);
-
-
     G_DoLoadLevel ();
 }