From 7f98c28089005fccf77dad37a4e707c19ce9860d Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 17 May 2021 21:41:01 +0200 Subject: [PATCH] Fix help menu not returning to main menu. --- language.version | 4 ++-- zscript/menu/swwm_help.zsc | 1 + zscript/swwm_statichandler.zsc | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index d357b7e42..e66db75fc 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r494 \cu(Mon 17 May 21:34:39 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r494 \cu(2021-05-17 21:34:40)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r495 \cu(Mon 17 May 21:41:01 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r495 \cu(2021-05-17 21:41:01)\c-"; diff --git a/zscript/menu/swwm_help.zsc b/zscript/menu/swwm_help.zsc index 154e46e43..de11f9e62 100644 --- a/zscript/menu/swwm_help.zsc +++ b/zscript/menu/swwm_help.zsc @@ -31,6 +31,7 @@ Class SWWMHelpMenu : GenericMenu override void Init( Menu parent ) { + Super.Init(parent); curpage = 0; prevpage = -1; fadetic = gametic; diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc index cdee3c272..8f7268d7e 100644 --- a/zscript/swwm_statichandler.zsc +++ b/zscript/swwm_statichandler.zsc @@ -310,8 +310,11 @@ Class SWWMStaticHandler : StaticEventHandler Menu cur = Menu.GetCurrentMenu(); if ( cur is 'ReadThisMenu' ) { + Menu oldpt = cur.mParentMenu; cur.Close(); Menu.SetMenu('SWWMHelpMenu'); + cur = Menu.GetCurrentMenu(); + if ( cur ) cur.mParentMenu = oldpt; } // Fancy crash effect if ( (gamestate == GS_LEVEL) || (gamestate == GS_TITLELEVEL) )