From d0287b7ade63c07de315765933abc995a0907106 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Sun, 21 Mar 2021 12:01:11 +0100
Subject: [PATCH] GZDoom 4.5.0 compat fixes.

---
 language.version                             | 4 ++--
 zmapinfo.txt                                 | 4 ++--
 zscript/handler/swwm_handler_worldthings.zsc | 2 +-
 zscript/swwm_common.zsc                      | 5 +++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/language.version b/language.version
index ec94e7b8e..db339f6ff 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r392 \cu(Sun 21 Mar 03:35:14 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r392 \cu(2021-03-21 03:35:14)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r392 \cu(Sun 21 Mar 12:01:11 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r392 \cu(2021-03-21 12:01:11)\c-";
diff --git a/zmapinfo.txt b/zmapinfo.txt
index 7662b83a6..0af253300 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -28,7 +28,7 @@ GameInfo
 	MenuFontColor_Highlight = "Sapphire"
 	MenuFontColor_Selection = "Sapphire"
 	MenuSliderColor = "Green"
-	MenuSliderBackColor = "DarkGray"
+	//MenuSliderBackColor = "DarkGray"
 	MenuBackButton = "graphics/swwmback.png"
 	MessageBoxClass = "SWWMMessageBox"
 	PauseSign = "graphics/swwmpause.png"
@@ -143,7 +143,7 @@ Skill lunatic
 	SpawnFilter = nightmare
 	SpawnMulti
 	TotalInfighting
-	InstantReaction
+	//InstantReaction
 	NoPain
 	ACSReturn = 4
 	Name = "$SWWM_SKLUNATIC"
diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc
index e116d4c7a..912e67acb 100644
--- a/zscript/handler/swwm_handler_worldthings.zsc
+++ b/zscript/handler/swwm_handler_worldthings.zsc
@@ -183,7 +183,7 @@ extend Class SWWMHandler
 	private bool SuppressMultiItem( WorldEvent e )
 	{
 		// quick checks
-		if ( !G_SkillPropertyInt(SKILLP_SpawnMulti) || multiplayer || (dmflags2&(1<<29)) )	// wow there's no dmflags constants defined in zscript???
+		if ( !G_SkillPropertyInt(SKILLP_SpawnMulti) || multiplayer || sv_alwaysspawnmulti )
 			return false;
 		// is it coop inventory? suppress it
 		if ( (e.Thing.spawnflags&(MTF_COOPERATIVE|MTF_DEATHMATCH)) && !(e.Thing.spawnflags&MTF_SINGLE) && (e.Thing is 'Inventory') )
diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc
index 9e0191876..2aed8c313 100644
--- a/zscript/swwm_common.zsc
+++ b/zscript/swwm_common.zsc
@@ -20,6 +20,11 @@ enum ESWWMGZChannels
 const FallbackTag = "AWESOME IT'S PENIS"; // used on tag processing, please don't mind the actual string used)
 const MaxBouncePerTic = 40;	// maximum simultaneous bounces in one tic for a lightweight actor before we consider it's stuck
 
+// fixup for 4.5 compat, will be removed once a new version lands
+// SKILLP_SpawnMulti is not defined in zscript, so it has to be declared here
+// (somehow this hackaround doesn't break anything in devbuilds)
+const SKILLP_SpawnMulti = SKILLP_PlayerRespawn+1;
+
 // Future planning, will be filled out with AI stuff and whatnot someday
 Class SWWMMonster : Actor abstract
 {