From 505987b72c8e6f4ae2c87208c02f447d0f8773eb Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Thu, 2 Jun 2022 00:51:02 +0200
Subject: [PATCH] Remove QF_3D from A_QuakeEx calls with 65535 radius.

---
 language.version                               | 4 ++--
 zscript/swwm_monsters.zsc                      | 4 ++--
 zscript/weapons/swwm_deathlydeathcannon_fx.zsc | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/language.version b/language.version
index 56de1f2d3..889f9b35d 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 r1 \cu(Tue  7 Jun 12:01:51 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.21 r1 \cu(2022-06-07 12:01:51)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.21 r2 \cu(Tue  7 Jun 12:02:11 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.21 r2 \cu(2022-06-07 12:02:11)\c-";
diff --git a/zscript/swwm_monsters.zsc b/zscript/swwm_monsters.zsc
index 193882e09..308a6f819 100644
--- a/zscript/swwm_monsters.zsc
+++ b/zscript/swwm_monsters.zsc
@@ -300,7 +300,7 @@ Class SWWMBossBrain : BossBrain
 		MBRN A 10
 		{
 			A_StartSound("brain/pain",CHAN_VOICE,attenuation:ATTN_NONE);
-			A_QuakeEx(3,3,3,15,0,65535,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:.3);
+			A_QuakeEx(3,3,3,15,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65535,rollIntensity:.3);
 			if ( !eyeless ) SpawnBrainExpl(false);
 			Spawn("SWWMBossBrainPain",pos);
 		}
@@ -309,7 +309,7 @@ Class SWWMBossBrain : BossBrain
 		MBRN A 120
 		{
 			A_StartSound("brain/death",CHAN_VOICE,attenuation:ATTN_NONE);
-			A_QuakeEx(9,9,9,120,0,65535,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,rollIntensity:1.);
+			A_QuakeEx(9,9,9,120,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65535,rollIntensity:1.);
 			if ( !eyeless )
 			{
 				SpawnBrainExpl(true);
diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
index 25922bacb..791e426fa 100644
--- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
+++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc
@@ -1117,7 +1117,7 @@ Class YnykronShot : Actor
 	}
 	override void PostBeginPlay()
 	{
-		A_QuakeEx(6,6,6,150,0,65536,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:65536,rollIntensity:1.);
+		A_QuakeEx(6,6,6,150,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65535,rollIntensity:1.);
 		A_StartSound("ynykron/beam",CHAN_VOICE,CHANF_DEFAULT,1.,0.);
 		FlashPlayer(240,8000);
 		hitlist.Clear();
@@ -2594,7 +2594,7 @@ Class YnykronSingularity : Actor
 		A_ChangeLinkFlags(true);	// unlink from blockmap
 		A_AlertMonsters();
 		SWWMUtility.DoExplosion(self,int.max,500000,800,400);
-		A_QuakeEx(8,8,8,100,0,65536,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:65536,rollIntensity:1.6);
+		A_QuakeEx(8,8,8,100,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65535,rollIntensity:1.6);
 		A_StopAllSounds();
 		A_StartSound("ynykron/vortexend",CHAN_VOICE,attenuation:0.);
 		FlashPlayer(250,9000);
@@ -2906,7 +2906,7 @@ Class YnykronAltShot : Actor
 	}
 	override void PostBeginPlay()
 	{
-		A_QuakeEx(4,4,4,80,0,65536,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:65536,rollIntensity:.8);
+		A_QuakeEx(4,4,4,80,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65535,rollIntensity:.8);
 		A_StartSound("ynykron/altbeam",CHAN_VOICE,CHANF_DEFAULT,1.,0.);
 		FlashPlayer(240,8000);
 		let b = Spawn("YnykronAltBeam",pos);