fix pause menu bugs
This commit is contained in:
@@ -22,6 +22,7 @@ import flixel.util.FlxTimer;
|
||||
import flixel.math.FlxPoint;
|
||||
import haxe.Constraints;
|
||||
import kiss_flixel.SpriteTools;
|
||||
import kiss_flixel.SimpleWindow;
|
||||
import haxe.ds.Option;
|
||||
import kiss_tools.KeyShortcutHandler;
|
||||
import kiss_tools.FlxKeyShortcutHandler;
|
||||
|
@@ -51,16 +51,21 @@
|
||||
(when music
|
||||
(resumeAndUpdateCurrentVolume [music] musicVolume)))
|
||||
|
||||
(prop &mut :SimpleWindow pauseMenu null)
|
||||
|
||||
(method :Void showPauseMenu [:Continuation resume]
|
||||
// register escape to resume (and register escape to pause when resuming lol)
|
||||
(sh.registerItem "{escape} resume" ->cc {
|
||||
(pauseMenu.hide)
|
||||
(sh.registerItem "{escape} pause" ->cc (showPauseMenu cc) true)
|
||||
(resume)
|
||||
} true)
|
||||
(chooseString "PAUSED" ["Resume" "Options" "Main Menu" "Quit to Desktop"]
|
||||
->choice
|
||||
(case choice
|
||||
("Resume" (resume))
|
||||
("Resume"
|
||||
(sh.registerItem "{escape} pause" ->cc (showPauseMenu cc) true)
|
||||
(resume))
|
||||
("Options"
|
||||
(sh.registerItem "{escape} nil" ->cc {} true)
|
||||
(MenuState.optionsMenu ->(showPauseMenu resume)))
|
||||
@@ -123,18 +128,19 @@
|
||||
(var &mut :FlxMouseEventManager mm null)
|
||||
|
||||
(method :Void chooseString [:String prompt :Array<String> choices :String->Void submit]
|
||||
(kiss_flixel.SimpleWindow.promptForChoice
|
||||
prompt
|
||||
choices
|
||||
submit
|
||||
FlxColor.BLACK
|
||||
FlxColor.WHITE
|
||||
0.8
|
||||
0.8
|
||||
true
|
||||
""
|
||||
"left"
|
||||
"right"))
|
||||
(set pauseMenu
|
||||
(kiss_flixel.SimpleWindow.promptForChoice
|
||||
prompt
|
||||
choices
|
||||
submit
|
||||
FlxColor.BLACK
|
||||
FlxColor.WHITE
|
||||
0.8
|
||||
0.8
|
||||
true
|
||||
""
|
||||
"left"
|
||||
"right")))
|
||||
|
||||
(method :Void defineFlxPoint [:FlxPoint->Void submit]
|
||||
(unless mm
|
||||
|
Reference in New Issue
Block a user