From 73da6187502fb5bcbd7d41b97d01042819a3962d Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Fri, 18 Jun 2021 11:17:01 +0200
Subject: [PATCH] Fix unwanted line activation while dashing.

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

diff --git a/language.version b/language.version
index 2687b7e92..a9d2566a1 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r546 \cu(Thu 17 Jun 17:06:08 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r546 \cu(2021-06-17 17:06:08)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r547 \cu(Fri 18 Jun 11:17:01 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r547 \cu(2021-06-18 11:17:01)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index f29070719..90abc6af5 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -1073,6 +1073,15 @@ Class Demolitionist : PlayerPawn
 		PainChance = isdashing?0:255;
 		if ( isdashing || (vel.length() > 30) )
 		{
+			bool oldpush = bCANPUSHWALLS;
+			bool olduse = bCANUSEWALLS;
+			bool oldmcross = bACTIVATEMCROSS;
+			bool oldtele = bNOTELEPORT;
+			// needed to prevent the many TryMove calls from activating unwanted lines
+			bCANPUSHWALLS = false;
+			bCANUSEWALLS = false;
+			bACTIVATEMCROSS = false;
+			bNOTELEPORT = true;
 			Actor a;
 			if ( isdashing && (dashboost > 0.) )
 			{
@@ -1391,6 +1400,10 @@ Class Demolitionist : PlayerPawn
 			}
 			SetOrigin(oldpos,true);
 			bTHRUACTORS = oldthru;
+			bCANPUSHWALLS = oldpush;
+			bCANUSEWALLS = olduse;
+			bACTIVATEMCROSS = oldmcross;
+			bNOTELEPORT = oldtele;
 		}
 		else if ( isboosting && (dashboost > 0.) )
 		{