From 77ea2c1f567b793f1b067e244ebf184dff2581b0 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Wed, 16 Aug 2023 11:20:27 -0600 Subject: [PATCH] allow X/escape from resume menu/Scene selection via resume menu --- src/hollywoo_flixel/FlxDirector.kiss | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/hollywoo_flixel/FlxDirector.kiss b/src/hollywoo_flixel/FlxDirector.kiss index b97c91c..7f3282c 100644 --- a/src/hollywoo_flixel/FlxDirector.kiss +++ b/src/hollywoo_flixel/FlxDirector.kiss @@ -14,16 +14,17 @@ (method :Void promptForResume [:FlxMovie movie] (movie.createCameras) (if (and FlxDirector.lastSceneLabel (.exists (movie.labelRunners) FlxDirector.lastSceneLabel)) - (chooseString "Resume from '${FlxDirector.lastSceneLabel}'?" ["" "Resume" "Scene Selection" "Start From Beginning"] - ->choice (case choice - ("Resume" (movie.runFromLabel FlxDirector.lastSceneLabel)) - ("Scene Selection" - (sceneSelection - ->:Void { - (FlxG.switchState (new MenuState)) - })) - ("Start From Beginning" (movie.run)) - (never otherwise))) + {(_chooseString "Resume from '${FlxDirector.lastSceneLabel}'?" ["" "Resume" "Scene Selection" "Start From Beginning"] + ->choice (case choice + ("Resume" (movie.runFromLabel FlxDirector.lastSceneLabel)) + ("Scene Selection" + (sceneSelection + ->:Void { + (FlxG.switchState (new MenuState)) + })) + ("Start From Beginning" (movie.run)) + (never otherwise)) true "escape") + (set pauseMenu.onClose ->:Void (FlxG.switchState (new MenuState)))} (movie.run))) (defNew [] @@ -108,7 +109,7 @@ (let [m flxMovie] (m.prepareForSkip) ((dictGet runners label) m.skipMovie)) - } true) + } true "escape") (set pauseMenu.selectedIndex lastLabelIndex) (set pauseMenu.onClose cancel)))