From ffa752e0da2dc99adb8a7279f64773719d66f356 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sat, 12 Feb 2022 12:30:54 +0100
Subject: [PATCH] Update checksums of Kinsie's Test Map in swwm_compat.zsc.

---
 language.version                        | 4 ++--
 zscript/compat/swwm_compat.zsc          | 9 +++------
 zscript/handler/swwm_handler_damage.zsc | 9 ++++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/language.version b/language.version
index a102eaae9..75728432a 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r143 \cu(Fri 11 Feb 18:06:31 CET 2022)\c-";
-SWWM_SHORTVER="\cw1.2pre r143 \cu(2022-02-11 18:06:31)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2pre r144 \cu(Sat 12 Feb 12:30:54 CET 2022)\c-";
+SWWM_SHORTVER="\cw1.2pre r144 \cu(2022-02-12 12:30:54)\c-";
diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc
index e7d918311..6c59109a3 100644
--- a/zscript/compat/swwm_compat.zsc
+++ b/zscript/compat/swwm_compat.zsc
@@ -491,15 +491,12 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 			AddThing(4206920,(2912,256,-112),180,SKILLS_ALL,MTF_SINGLE|MTF_COOPERATIVE);
 			break;
 		// Kinsie's Test Map
-		case '0EADB2F82732A968B8513E4DC6138439':
-		case 'D70250F93C6B6072DA39D9672B37F236':
-		case '959A613006CC3AA912C4A22908B7566A':
+		case 'E43C1797DFD9443D1B4C035327743588':
+		case '81033F4F11F652E9CA875CED06C7AF8C':
+		case '0D1CAD582F63A179BF8A5E47C12D10C6':
 			// add collectibles
 			for ( int i=0; i<12; i++ )
 				AddThing(4206900+i,(1472+64*i,640,0),0,SKILLS_ALL,MTF_SINGLE|MTF_COOPERATIVE);
-			// add some chance boxes
-			for ( int i=0; i<3; i++ )
-				AddThing(4206920,(3616,1824-64*i,0),180,SKILLS_ALL,MTF_SINGLE|MTF_COOPERATIVE);
 			break;
 		}
 		switch ( checksum )
diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc
index 70cc765ce..c313382ee 100644
--- a/zscript/handler/swwm_handler_damage.zsc
+++ b/zscript/handler/swwm_handler_damage.zsc
@@ -399,11 +399,10 @@ extend Class SWWMHandler
 			return;
 		}
 		DoGibThing(e);
-		// romero hax
-		if ( (e.Thing is 'BossBrain') && (e.DamageType == 'Telefrag') )
-			e.DamageSource.DamageMobj(null,null,Actor.TELEFRAG_DAMAGE,'EndLevel');
-		// voodoo doll telefragging barrel hax (eviternity death exits)
-		if ( (e.Thing is 'ExplosiveBarrel') && (e.DamageType == 'Telefrag') && e.DamageSource.player && (e.DamageSource.player.mo != e.DamageSource) )
+		// death exit hax
+		// could be telefragging Romero, or a voodoo doll telefragging a barrel (death exits in Eviternity)
+		if ( (e.DamageType == 'Telefrag') && e.DamageSource && e.DamageSource.player
+			&& ((e.Thing is 'BossBrain') || ((e.Thing is 'ExplosiveBarrel') && (e.DamageSource.player.mo != e.DamageSource))) )
 			e.DamageSource.DamageMobj(null,null,Actor.TELEFRAG_DAMAGE,'EndLevel');
 		if ( !e.Thing.player && !e.Thing.bIsMonster && !e.Thing.bCountKill && !(e.Thing is 'ScriptedMarine') )
 		{