From 0af4f734c83c6af1880a72b158a268ca6a0d141a Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 19 Feb 2021 11:11:37 +0100 Subject: [PATCH] Allow broken crushers to be busted. --- language.version | 4 ++-- zscript/swwm_utility.zsc | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index a13ec60af..9da945f5a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r288 \cu(Thu 18 Feb 22:54:36 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r288 \cu(2021-02-18 22:54:36)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r289 \cu(Fri 19 Feb 11:11:37 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r289 \cu(2021-02-19 11:11:37)\c-"; diff --git a/zscript/swwm_utility.zsc b/zscript/swwm_utility.zsc index bb67c6915..a029c76cc 100644 --- a/zscript/swwm_utility.zsc +++ b/zscript/swwm_utility.zsc @@ -437,6 +437,14 @@ Class SWWMUtility return true; } } + // moderate: see if it's a busted crusher, we need to be able to break those in case they cause a softlock + let ti = ThinkerIterator.Create("SWWMCrusherBroken",Thinker.STAT_USER); + SWWMCrusherBroken cb; + while ( cb = SWWMCrusherBroken(ti.Next()) ) + { + if ( (part == 0) && (cb.fsec == s) ) return true; + if ( (part == 1) && (cb.csec == s) ) return true; + } // hard mode: look for all lines/actors with movement specials referencing us for ( int i=0; i