From bb9e37d7f3d4f8c6cdbf634bb0c5a924de3e6b08 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 8 May 2022 23:20:34 +0200
Subject: [PATCH] Fix incorrect underwater detection.

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

diff --git a/language.version b/language.version
index 1033201ad..c300aef83 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.18 \cu(Sun  8 May 23:23:41 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.18 \cu(2022-05-08 23:23:41)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.18 r1 \cu(Sun  8 May 23:23:54 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.18 r1 \cu(2022-05-08 23:23:54)\c-";
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 66679b11e..2d958a7a0 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -749,7 +749,7 @@ Class Demolitionist : PlayerPawn
 		Sector headregion = null;
 		if ( CurSector.moreflags&Sector.SECMF_UNDERWATER ) // check underwater sector
 			headregion = CurSector;
-		else if ( CurSector.heightsec && (Cursector.heightsec.moreflags&Sector.SECMF_UNDERWATER) ) // check height transfer
+		else if ( CurSector.heightsec && (Cursector.heightsec.moreflags&Sector.SECMF_UNDERWATERMASK) ) // check height transfer
 		{
 			let hsec = CurSector.heightsec;
 			double fh = hsec.floorplane.ZAtPoint(pos.xy);
@@ -766,7 +766,7 @@ Class Demolitionist : PlayerPawn
 			for ( int i=0; i<CurSector.Get3DFloorCount(); i++ )
 			{
 				let ff = CurSector.Get3DFloor(i);
-				if ( !(ff.flags&F3DFloor.FF_EXISTS) || (ff.flags&F3DFloor.FF_SOLID) || (!(ff.flags&F3DFloor.FF_SWIMMABLE) && (ff.alpha == 0)) ) continue;
+				if ( !(ff.flags&F3DFloor.FF_EXISTS) || (ff.flags&F3DFloor.FF_SOLID) || !(ff.flags&F3DFloor.FF_SWIMMABLE) ) continue;
 				double ff_bottom = ff.bottom.ZAtPoint(pos.xy);
 				double ff_top = ff.top.ZAtPoint(pos.xy);
 				if ( (ff_top <= pos.z) || (ff_bottom > centerpos.z) ) continue;