Bug tracking in menu key presses
This commit is contained in:
+10
-7
@@ -33,12 +33,12 @@ splashMenuOptions =
|
||||
basicKeyOptions
|
||||
[ Toggle ( loadSaveSlot (SaveSlotNum 0)) displaycontinue
|
||||
, Toggle ( startNewGameInSlot 0) (opText "NEW WITH RANDOM SEED")
|
||||
, Toggle ( reloadLevelStart) (displaywhenseed "NEW WITH LAST SEED")
|
||||
, Toggle reloadLevelStart (displaywhenseed "NEW WITH LAST SEED")
|
||||
, Toggle (pushScreen $ seedStartMenu "START FROM SEED") (opText "NEW WITH SPECIFIC SEED")
|
||||
, Toggle (pushScreen optionMenu) (opText "OPTIONS")
|
||||
, Toggle (pushScreen displayControls) (opText "VIEW CONTROLS")
|
||||
, Toggle (id) (displaywhenseed "VIEW LAST SEED")
|
||||
, Toggle (id) (opText "QUIT")
|
||||
, Toggle id (displaywhenseed "VIEW LAST SEED")
|
||||
, Toggle hardQuit (opText "QUIT")
|
||||
]
|
||||
where
|
||||
opText = const . MODString
|
||||
@@ -48,21 +48,21 @@ splashMenuOptions =
|
||||
| otherwise = MODString str
|
||||
|
||||
pauseMenu :: ScreenLayer
|
||||
pauseMenu = slTitleOptionsEff "PAUSED" pauseMenuOptions (unpause)
|
||||
pauseMenu = slTitleOptionsEff "PAUSED" pauseMenuOptions unpause
|
||||
|
||||
pauseMenuOptions :: [MenuOption]
|
||||
pauseMenuOptions =
|
||||
basicKeyOptions
|
||||
[ Toggle popScreen (opText "CONTINUE")
|
||||
, Toggle (startNewGameInSlot 0) (opText "NEW GAME")
|
||||
, Toggle (reloadLevelStart) (opText "RESTART")
|
||||
, Toggle reloadLevelStart (opText "RESTART")
|
||||
, Toggle (pushScreen $ seedStartMenu "START FROM SEED") (opText "NEW FROM SEED")
|
||||
, Toggle (pushScreen optionMenu) (opText "OPTIONS")
|
||||
, Toggle (pushScreen displayControls) (opText "VIEW CONTROLS")
|
||||
, Toggle id (opText "VIEW CURRENT SEED")
|
||||
, Toggle saveQuit (opText "SAVE AND QUIT")
|
||||
]
|
||||
++ [ InvisibleToggle ScancodeEscape id
|
||||
++ [ InvisibleToggle ScancodeEscape hardQuit
|
||||
]
|
||||
where
|
||||
opText = const . MODString
|
||||
@@ -70,6 +70,9 @@ pauseMenuOptions =
|
||||
saveQuit :: Universe -> Universe
|
||||
saveQuit u = u & addSideEffect (saveQuitConc u) "SAVING"
|
||||
|
||||
hardQuit :: Universe -> Universe
|
||||
hardQuit = addSideEffect (return $ const Nothing) "QUITTING"
|
||||
|
||||
saveQuitConc :: Universe -> IO (Universe -> Maybe Universe)
|
||||
saveQuitConc u = do
|
||||
void $ writeSaveSlot (SaveSlotNum 0) u
|
||||
@@ -125,7 +128,7 @@ debugMenuOptions =
|
||||
f :: DebugBool -> Scancode -> MenuOption
|
||||
f bd =
|
||||
Toggle
|
||||
((uvConfig . debug_booleans . at bd %~ toggleJust))
|
||||
(uvConfig . debug_booleans . at bd %~ toggleJust)
|
||||
(uncurry MODStringOption . g bd . (^? uvConfig . debug_booleans . ix bd))
|
||||
g bd Nothing = (show bd, "False")
|
||||
g bd _ = (show bd, "True")
|
||||
|
||||
Reference in New Issue
Block a user