From b046c04733fff5d40f41106f60f075c9aa3f9a71 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 20 Aug 2021 21:48:46 +0200 Subject: [PATCH] Fix inability to close demolitionist menu in mp (hopefully). --- language.version | 4 ++-- zscript/handler/swwm_handler_process.zsc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/language.version b/language.version index 23233072b..da43ec14a 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.0.5 r1 \cu(Fri 20 Aug 21:20:07 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.0.5 r1 \cu(2021-08-20 21:20:07)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.0.5 r2 \cu(Fri 20 Aug 21:48:46 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.0.5 r2 \cu(2021-08-20 21:48:46)\c-"; diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index 335beca51..a01ba2f75 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -11,7 +11,8 @@ extend Class SWWMHandler { if ( (gamestate != GS_LEVEL) || (players[consoleplayer].Health <= 0) || !(players[consoleplayer].mo is 'Demolitionist') ) return; - Menu.SetMenu('DemolitionistMenu'); + if ( !(Menu.GetCurrentMenu() is 'DemolitionistMenu') ) + Menu.SetMenu('DemolitionistMenu'); } else if ( e.Name ~== "swwmzoomin" ) {