From efe76a6647977fd53c279689b29ce8244a64df79 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:32:42 +0200
Subject: [PATCH 1/4] - Blood: fixed crash with badly defined drop objects.

Got -1 for picnum there, this was causing crashes.
---
 source/games/blood/src/actor.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp
index 1ffdd1d79..364373526 100644
--- a/source/games/blood/src/actor.cpp
+++ b/source/games/blood/src/actor.cpp
@@ -2854,7 +2854,12 @@ spritetype *actDropObject(spritetype *pSprite, int nType) {
     else if (nType >= kItemAmmoBase && nType < kItemAmmoMax) pSprite2 = actDropAmmo(pSprite, nType);
     else if (nType >= kItemWeaponBase && nType < kItemWeaponMax) pSprite2 = actDropWeapon(pSprite, nType);
     
-    if (pSprite2 && pSprite->picnum > -1) {
+    if (pSprite2) {
+        if (pSprite2->picnum == -1)
+        {
+            DeleteSprite(pSprite2 - sprite);
+            return nullptr;
+        }
         int top, bottom;
         GetSpriteExtents(pSprite2, &top, &bottom);
         if (bottom >= pSprite2->z)

From ac04403292d9e9c83261277e41dcaff93ea009f8 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:35:39 +0200
Subject: [PATCH 2/4] - added native support for Nightfright's Alien World
 Order" GRP generator.

---
 wadsrc/static/engine/grpinfo.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wadsrc/static/engine/grpinfo.txt b/wadsrc/static/engine/grpinfo.txt
index 305b3dc10..82b2b1e26 100644
--- a/wadsrc/static/engine/grpinfo.txt
+++ b/wadsrc/static/engine/grpinfo.txt
@@ -285,6 +285,14 @@ grpinfo
 	BkColor 0x8f8f8f
 }
 
+grpinfo
+{
+    name "Duke: Alien World Order"
+    dependency DUKE15_CRC
+	mustcontain "FIREFLYTROOPER.CON", "FLAMETHROWER.CON", "music/E5L1_BulletDam.ogg", "sound/VO_E5L1_Duke_CreamAndSugar.ogg"
+	gamefilter "Duke.Worldtour"
+}
+
 grpinfo
 {
 	name "Duke!ZONE II (1.3D)"

From aed7e8166e4a3a064b4384f842e85f1e29070f16 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:39:42 +0200
Subject: [PATCH 3/4] - fixed setup of startup title.

---
 source/core/gamecontrol.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index 28516cf0c..e2560c4a3 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -835,15 +835,18 @@ int RunGame()
 	G_LoadConfig();
 	auto usedgroups = SetupGame();
 
-	for (auto& grp : usedgroups)
+	bool colorset = false;
+	for (int i = usedgroups.Size()-1; i >= 0; i--)
 	{
+		auto& grp = usedgroups[i];
 		if (grp.FileInfo.name.IsNotEmpty())
 		{
 			if (GameStartupInfo.Name.IsEmpty()) GameStartupInfo.Name = grp.FileInfo.name;
-			if (grp.FileInfo.FgColor != grp.FileInfo.BgColor && (GameStartupInfo.FgColor != 0 || GameStartupInfo.BkColor != 0))
+			if (!colorset && grp.FileInfo.FgColor != grp.FileInfo.BgColor && (GameStartupInfo.FgColor != 0 || GameStartupInfo.BkColor != 0))
 			{
 				GameStartupInfo.FgColor = grp.FileInfo.FgColor;
 				GameStartupInfo.BkColor = grp.FileInfo.BgColor;
+				colorset = true;
 			}
 		}
 	}

From 1e40e93da4a78af7be88bb89ae45e6b825e1b121 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:47:16 +0200
Subject: [PATCH 4/4] - fixed the vertical offsets of the World Tour skies.

They were rendered too low.
---
 source/games/duke/src/game.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/games/duke/src/game.cpp b/source/games/duke/src/game.cpp
index 6a23cc55f..da5c038cf 100644
--- a/source/games/duke/src/game.cpp
+++ b/source/games/duke/src/game.cpp
@@ -194,14 +194,14 @@ static void setupbackdrop()
 	if (isWorldTour())
 	{
 		defineSky(5284, 65536, 3, defoff);
-		defineSky(5412, 65536, 3, defoff, 48);
-		defineSky(5420, 65536, 3, defoff, 48);
-		defineSky(5450, 65536, 3, defoff7, 48);
-		defineSky(5540, 65536, 3, defoff, 48);
-		defineSky(5548, 65536, 3, defoff, 48);
-		defineSky(5556, 65536, 3, defoff1, 48);
-		defineSky(5720, 65536, 3, defoff4, 48);
-		defineSky(5814, 65536, 3, defoff, 48);
+		defineSky(5412, 65536, 3, defoff, 80);
+		defineSky(5420, 65536, 3, defoff, 80);
+		defineSky(5450, 65536, 3, defoff7, 80);
+		defineSky(5540, 65536, 3, defoff, 80);
+		defineSky(5548, 65536, 3, defoff, 80);
+		defineSky(5556, 65536, 3, defoff1, 80);
+		defineSky(5720, 65536, 3, defoff4, 80);
+		defineSky(5814, 65536, 3, defoff, 80);
 	}
 
 	// Ugh... Since we do not know up front which of these tiles are skies we have to set them all...