From ab0270071ab65b79c32bedf891cdaa60f0283d49 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 7 Mar 2021 20:16:13 +0100
Subject: [PATCH] Player should remain solid on death to avoid clipping into
 things.

---
 language.version        | 4 ++--
 zscript/swwm_player.zsc | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/language.version b/language.version
index d0d43bb00..eb28e7699 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r329 \cu(Sun  7 Mar 17:37:55 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r329 \cu(2021-03-07 17:37:55)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r330 \cu(Sun  7 Mar 20:16:13 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r330 \cu(2021-03-07 20:16:13)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 2046650b1..342655a4f 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -96,6 +96,7 @@ Class Demolitionist : PlayerPawn
 		+NOICEDEATH;
 		+DONTMORPH;
 		+DONTDRAIN;
+		+DONTCORPSE;
 	}
 	// oh yay, more cheat modification
 	override void CheatGive( String name, int amount )
@@ -2342,7 +2343,7 @@ Class Demolitionist : PlayerPawn
 		XZW1 A 2
 		{
 			A_DemoScream();
-			A_NoBlocking();
+			bSOLID = true;	// we need this to avoid clipping into things
 		}
 		XZW2 RSTUVWXYZ 2;
 		XZW3 ABCDEFG 2;
@@ -2547,7 +2548,7 @@ Class Demolitionist : PlayerPawn
 		XZW7 M 2
 		{
 			A_DemoScream();
-			A_NoBlocking();
+			bSOLID = true;	// we need this to avoid clipping into things
 		}
 		XZW8 GHIJK 2;
 		XZW8 L 1 A_DMFade();