- DukeActor scriptification framework.

source/games/duke/src/actors.cpp

@@ -622,7 +622,6 @@ void movefx(void)
 
 //---------------------------------------------------------------------------
 //
-// split out of movestandables
 //
 //---------------------------------------------------------------------------
 

source/games/duke/src/actors_d.cpp

@@ -1188,7 +1188,11 @@ void movestandables_d(void)
 			continue;
 		}
 
-
+		if (act->GetClass() != RUNTIME_CLASS(DDukeActor))
+		{
+			CallTick(act);
+			continue;
+		}
 		if (picnum >= CRANE && picnum <= CRANE +3)
 		{
 			movecrane(act, CRANE);

source/games/duke/src/actors_r.cpp

@@ -830,6 +830,11 @@ void movestandables_r(void)
 			continue;
 		}
 
+		if (act->GetClass() != RUNTIME_CLASS(DDukeActor))
+		{
+			CallTick(act);
+			continue;
+		}
 		if (picnum >= CRANE && picnum <= CRANE +3)
 		{
 			movecrane(act, CRANE);

source/games/duke/src/duke3d.h

@@ -118,5 +118,10 @@ struct Dispatcher
 
 extern Dispatcher fi;
 
+void CallInitialize(DDukeActor* actor);
+void CallTick(DDukeActor* actor);
+void CallAction(DDukeActor* actor);
+
+
 END_DUKE_NS
 

source/games/duke/src/game.cpp

@@ -400,4 +400,31 @@ void GameInterface::app_init()
 }
 
 
+void CallInitialize(DDukeActor* actor)
+{
+	IFVIRTUALPTR(actor, DDukeActor, initialize)
+	{
+		VMValue val = actor;
+		VMCall(func, &val, 1, nullptr, 0);
+	}
+}
+
+void CallTick(DDukeActor* actor)
+{
+	IFVIRTUALPTR(actor, DDukeActor, Tick)
+	{
+		VMValue val = actor;
+		VMCall(func, &val, 1, nullptr, 0);
+	}
+}
+
+void CallAction(DDukeActor* actor)
+{
+	IFVIRTUALPTR(actor, DDukeActor, RunState)
+	{
+		VMValue val = actor;
+		VMCall(func, &val, 1, nullptr, 0);
+	}
+}
+
 END_DUKE_NS

source/games/duke/src/premap.cpp

@@ -941,12 +941,16 @@ static TArray<DDukeActor*> spawnactors(SpawnSpriteDef& sprites)
 			continue;
 		}
 		auto sprt = &sprites.sprites[i];
-		auto actor = static_cast<DDukeActor*>(InsertActor(RUNTIME_CLASS(DDukeActor), sprt->sectp, sprt->statnum));
-		spawns[j++] = actor;
-		actor->spr = sprites.sprites[i];
-		if (sprites.sprext.Size()) actor->sprext = sprites.sprext[i];
-		else actor->sprext = {};
-		actor->spsmooth = {};
+		auto info = spawnMap.CheckKey(sprt->picnum);
+		auto actor = static_cast<DDukeActor*>(InsertActor(info? info->Class() : RUNTIME_CLASS(DDukeActor), sprt->sectp, sprt->statnum));
+		if (actor)
+		{
+			spawns[j++] = actor;
+			actor->spr = sprites.sprites[i];
+			if (sprites.sprext.Size()) actor->sprext = sprites.sprext[i];
+			else actor->sprext = {};
+			actor->spsmooth = {};
+		}
 	}
 	return spawns;
 }

source/games/duke/src/spawn.cpp

@@ -53,7 +53,9 @@ DDukeActor* EGS(sectortype* whatsectp, int s_x, int s_y, int s_z, int s_pn, int8
 {
 	// sector pointer must be strictly validated here or the engine will crash.
 	if (whatsectp == nullptr || !validSectorIndex(sectnum(whatsectp))) return nullptr;
-	auto act = static_cast<DDukeActor*>(::InsertActor(RUNTIME_CLASS(DDukeActor), whatsectp, s_ss));
+
+	auto info = spawnMap.CheckKey(s_pn);
+	auto act = static_cast<DDukeActor*>(InsertActor(info ? info->Class() : RUNTIME_CLASS(DDukeActor), whatsectp, s_ss));
 
 	if (act == nullptr) return nullptr;
 	SetupGameVarsForActor(act);
@@ -126,6 +128,7 @@ DDukeActor* EGS(sectortype* whatsectp, int s_x, int s_y, int s_z, int s_pn, int8
 	act->spsmooth = {};
 
 	return act;
+
 }
 
 

source/games/duke/src/spawn_d.cpp

@@ -43,6 +43,11 @@ BEGIN_DUKE_NS
 
 DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>* actors)
 {
+	if (act->GetClass() != RUNTIME_CLASS(DDukeActor))
+	{
+		CallOnSpawn(act);
+		return act;
+	}
 	auto sectp = act->sector();
 
 	if (isWorldTour())

source/games/duke/src/spawn_r.cpp

@@ -37,6 +37,11 @@ BEGIN_DUKE_NS
 
 DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>* actors)
 {
+	if (act->GetClass() != RUNTIME_CLASS(DDukeActor))
+	{
+		CallInitialize(act);
+		return act;
+	}
 	auto sectp = act->sector();
 
 	switch (act->spr.picnum)

source/games/duke/src/types.h

@@ -120,6 +120,16 @@ class DDukeActor : public DCoreActor
 
 	void Serialize(FSerializer& arc) override;
 
+	void ChangeType(PClass* newtype)
+	{
+		if (newtype->IsDescendantOf(RUNTIME_CLASS(DDukeActor)) && newtype->Size == RUNTIME_CLASS(DDukeActor)->Size && GetClass()->Size == RUNTIME_CLASS(DDukeActor)->Size)
+		{
+			// It sucks having to do this but the game heavily depends on being able to swap out the class type and often uses this to manage actor state.
+			// We'll allow this only for classes that do not add their own data, though.
+			SetClass(newtype);
+		}
+	}
+
 };
 
 // subclassed to add a game specific actor() method
@@ -335,7 +345,6 @@ struct player_struct
 	{
 		return cursector != nullptr;
 	}
-
 };
 
 struct Cycler

wadsrc/static/zscript.txt

@@ -46,6 +46,8 @@ version "4.3"
 #include "zscript/games/duke/ui/screens.zs"
 #include "zscript/games/duke/ui/cutscenes.zs"
 #include "zscript/games/duke/ui/menu.zs"
+#include "zscript/games/duke/actors/dukeactor.zs"
+
 #include "zscript/games/blood/bloodgame.zs"
 #include "zscript/games/blood/ui/menu.zs"
 #include "zscript/games/blood/ui/sbar.zs"

wadsrc/static/zscript/games/duke/actors/DukeActor.zs

@@ -0,0 +1,16 @@
+class DukeActor : CoreActor native
+{ 
+	virtual native void Initialize();
+	virtual native void Tick();
+	virtual native void RunState();	// this is the CON function.
+}
+
+class DukeCrane : DukeActor
+{
+	override native void Initialize();
+	override native void Tick();
+}
+
+class DukeCranePole : DukeActor
+{
+}