From fb91b25643808b7d129d33bb7ec1175fa326c27c Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 26 May 2021 12:48:29 +0200 Subject: [PATCH] Clean up some remaining 4.5 compat tidbits. --- language.version | 4 ++-- zmapinfo.txt | 4 ++-- zscript/swwm_common.zsc | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/language.version b/language.version index b0112ae48..d509a0ada 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r510 \cu(Wed 26 May 09:33:12 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r510 \cu(2021-05-26 09:33:12)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r512 \cu(Wed 26 May 12:49:37 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r512 \cu(2021-05-26 12:49:37)\c-"; diff --git a/zmapinfo.txt b/zmapinfo.txt index 95d0f024a..518dc52d9 100644 --- a/zmapinfo.txt +++ b/zmapinfo.txt @@ -27,7 +27,7 @@ GameInfo MenuFontColor_Highlight = "Sapphire" MenuFontColor_Selection = "Sapphire" MenuSliderColor = "Green" - //MenuSliderBackColor = "DarkGray" + MenuSliderBackColor = "DarkGray" MenuBackButton = "graphics/swwmback.png" MessageBoxClass = "SWWMMessageBox" PauseSign = "graphics/swwmpause.png" @@ -144,7 +144,7 @@ Skill lunatic SpawnFilter = nightmare SpawnMulti TotalInfighting - //InstantReaction + InstantReaction NoPain ACSReturn = 4 Name = "$SWWM_SKLUNATIC" diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index f128d0059..0844aa7a3 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -20,11 +20,6 @@ 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; - // basic "does nothing" actor, used to remove stuff in CheckReplacement Class SWWMNothing : Actor {