From 7a1e7a41a4474a8828e9f68a94cdae879d400dec Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Sun, 20 Nov 2022 20:30:45 +0100
Subject: [PATCH] Mikoportal compatibility for voodoo dolls. Includes VM abort
 fix for KDiKDiZD (though both mods are incompatible).

---
 language.version                           |  4 ++--
 zscript/handler/swwm_handler_worldload.zsc | 21 +++++++++++++++++++++
 zscript/swwm_player.zsc                    | 11 +++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/language.version b/language.version
index be18b4ffb..08709fc32 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r622 \cu(Sun 20 Nov 20:30:35 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r622 \cu(2022-11-20 20:30:35)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r623 \cu(Sun 20 Nov 20:30:45 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r623 \cu(2022-11-20 20:30:45)\c-";
diff --git a/zscript/handler/swwm_handler_worldload.zsc b/zscript/handler/swwm_handler_worldload.zsc
index 49d85ba55..fe02e1c3d 100644
--- a/zscript/handler/swwm_handler_worldload.zsc
+++ b/zscript/handler/swwm_handler_worldload.zsc
@@ -261,6 +261,27 @@ extend Class SWWMHandler
 			// while we're at it
 			Actor.Spawn("RampancyLogonDummy");
 		}
+		// KDiKDiZD abort fix due to voodoo doll post-spawn replacement
+		// (we have our own mikoportal compatibility, anyway)
+		//
+		// note that the mods are mutually incompatible nonetheless
+		// since KDiKDiZD requires software rendering, while this is a
+		// hardware-only mod... but hey, they can sort-of-work together
+		// (with broken visual effects, but still... somewhat working)
+		for ( int i=0; i<AllClasses.Size(); i++ )
+		{
+			if ( AllClasses[i].GetClassName() != 'KdikdizdCompatEventHandler' )
+				continue;
+			ti = ThinkerIterator.Create("Thinker");
+			Thinker t;
+			while ( t = ti.Next() )
+			{
+				if ( t.GetClassName() != 'VoodooPusher' )
+					continue;
+				t.Destroy();
+			}
+			break;
+		}
 		// setup cached lockdefs data
 		let cli = SWWMCachedLockInfo.GetInstance();
 		if ( cli.ent.Size() == 0 ) SetupLockdefsCache(cli);
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 0843c341f..a38c91b6c 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -3950,11 +3950,22 @@ Class Demolitionist : PlayerPawn
 
 Class SWWMVoodooDoll : PlayerPawn
 {
+	Vector3 lastvel;
+
 	override String GetObituary( Actor victim, Actor inflictor, Name mod, bool playerattack )
 	{
 		// as simple as it gets
 		return "$OB_VOODOO";
 	}
+	override void Tick()
+	{
+		Super.Tick();
+		// mikoportal compat
+		if ( !(pos.z ~== -32768) ) return;
+		if ( vel.length() <= lastvel.length() )
+			vel = lastvel;
+		lastvel = vel;
+	}
 	Default
 	{
 		Tag "$FN_VOODOO";