From 6c77d1c39edf1495642ce7ae65b5f1343ce2ffdd Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 9 Feb 2023 17:34:25 +0100
Subject: [PATCH] - Duke: fixed setup of purely scripted enemies,

Some band-aid is still needed for the time being.
---
 source/games/duke/src/spawn_d.cpp                 |   3 ++-
 source/games/duke/src/spawn_r.cpp                 |   3 ++-
 wadsrc/static/filter/blood/fonts/bigfont/0110.lmp | Bin 0 -> 179 bytes
 wadsrc/static/zscript/games/duke/dukeactor.zs     |   9 ++++++---
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 wadsrc/static/filter/blood/fonts/bigfont/0110.lmp

diff --git a/source/games/duke/src/spawn_d.cpp b/source/games/duke/src/spawn_d.cpp
index 8a0ce7c5a..c3ccc011b 100644
--- a/source/games/duke/src/spawn_d.cpp
+++ b/source/games/duke/src/spawn_d.cpp
@@ -149,7 +149,8 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 	switch (act->spr.picnum)
 	{
 	default:
-		CallInitialize(act);
+		if (!badguy(act) || commonEnemySetup(act, actj))
+			CallInitialize(act);
 		break;
 	case FOF:
 		act->spr.scale = DVector2(0, 0);
diff --git a/source/games/duke/src/spawn_r.cpp b/source/games/duke/src/spawn_r.cpp
index 7fd943fd1..66faac66f 100644
--- a/source/games/duke/src/spawn_r.cpp
+++ b/source/games/duke/src/spawn_r.cpp
@@ -61,7 +61,8 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
 	{
 	default:
 	default_case:
-		CallInitialize(act);
+		if (!badguy(act) || commonEnemySetup(act, actj))
+			CallInitialize(act);
 		break;
 	case RTILE_RRTILE7936:
 		if (!isRRRA()) goto default_case;
diff --git a/wadsrc/static/filter/blood/fonts/bigfont/0110.lmp b/wadsrc/static/filter/blood/fonts/bigfont/0110.lmp
new file mode 100644
index 0000000000000000000000000000000000000000..f02fe096586bc4519fe001bb3c706529fb9599eb
GIT binary patch
literal 179
zcmX}j+YJIC6a-KNvT}9V8z5{<cs1akJ=lXq*nkySf*n}qb&QWm&c{qLq*%RkgcF?M
z0#~@f9Ukz6Nv~_Iq88_7&mo~8r4&rodj3znci9*sCi;A4o%0x?H6y=boC_g*o3TVG
bd%wr6w<dOneyDLteZ(l!mbr~FDzm%*m3|c<

literal 0
HcmV?d00001

diff --git a/wadsrc/static/zscript/games/duke/dukeactor.zs b/wadsrc/static/zscript/games/duke/dukeactor.zs
index 55bf04734..427f7d3d2 100644
--- a/wadsrc/static/zscript/games/duke/dukeactor.zs
+++ b/wadsrc/static/zscript/games/duke/dukeactor.zs
@@ -263,9 +263,12 @@ class DukeActor : CoreActor native
 				self.scale = (0, 0);
 				self.ChangeStat(STAT_MISC);
 			}
-			self.clipdist = 10;
-			self.ownerActor = self;
-			self.ChangeStat(STAT_ACTOR);
+			else
+			{
+				self.clipdist = 10;
+				self.ownerActor = self;
+				self.ChangeStat(STAT_ACTOR);
+			}
 		}
 		
 	}