Move menu layers outside of world

src/Dodge/Event/Keyboard.hs

@@ -35,15 +35,15 @@ handlePressedKey :: Bool -> Scancode -> Universe -> Maybe Universe
 handlePressedKey True _     w   = Just w
 handlePressedKey _    ScancodeF5 w = Just $ over uvWorld doQuicksave w
 handlePressedKey _    ScancodeF9 w = Just $ over uvWorld (loadSaveSlot QuicksaveSlot) w
-handlePressedKey _    ScancodeSemicolon w = Just $ over uvWorld gotoTerminal w
+handlePressedKey _    ScancodeSemicolon w = Just $ gotoTerminal w
 handlePressedKey _    scode w
-    | null (_menuLayers (_uvWorld w))      = uvWorld (handlePressedKeyInGame scode) w
-    | otherwise                 = handlePressedKeyInMenu (head $ _menuLayers (_uvWorld w)) scode w
+    | null (_menuLayers w)      = uvWorld (handlePressedKeyInGame scode) w
+    | otherwise                 = handlePressedKeyInMenu (head $ _menuLayers w) scode w
 
 handlePressedKeyInGame :: Scancode -> World -> Maybe World
 handlePressedKeyInGame scode w
     | scode == escapeKey (_keyConfig w) = Nothing
-    | scode == pauseKey (_keyConfig w) = Just $ pauseGame $ escapeMap w
+--    | scode == pauseKey (_keyConfig w) = Just $ pauseGame $ escapeMap w
     | scode == dropItemKey (_keyConfig w) = Just $ youDropItem w
     | scode == toggleMapKey (_keyConfig w) = Just $ toggleMap w
     | scode == reloadKey (_keyConfig w) = Just $ fromMaybe w $ startReloadingWeapon (you w) w
@@ -61,7 +61,7 @@ toggleInv x y
     | x == y = TopInventory
     | otherwise = x
 
-gotoTerminal :: World -> World
+gotoTerminal :: Universe -> Universe
 gotoTerminal w = case _menuLayers w of
     (InputScreen _ : _ ) ->  w
     _ -> w & menuLayers %~ (InputScreen [] :)
@@ -77,7 +77,7 @@ spaceAction w = if _carteDisplay w
     theLoc = fst (_seenLocations w IM.! _selLocation w) w
     updateTopCloseObject i w' = w' & closeObjects %~ ( Right (_buttons w' IM.! i) : ) . tail 
 
-pauseGame :: World -> World
+pauseGame :: Universe -> Universe
 pauseGame w = w {_menuLayers = [pauseMenu]}
 
 toggleMap :: World -> World

src/Dodge/Event/Menu.hs

@@ -13,29 +13,30 @@ import SDL
 handlePressedKeyInMenu :: ScreenLayer -> Scancode -> Universe -> Maybe Universe
 handlePressedKeyInMenu mState scode = case mState of
     OptionScreen { _scOptions = mos, _scDefaultEff = defeff} 
-                        -> uvWorld $ optionListToEffects mos defeff scode
-    DisplayScreen {}    -> uvWorld $ popScreen
-    ColumnsScreen {}    -> uvWorld $ popScreen
+                        -> optionListToEffects mos defeff scode
+    DisplayScreen {}    -> popScreen
+    ColumnsScreen {}    -> popScreen
     WaitScreen {}       -> Just
-    TerminalScreen 0 _  -> uvWorld $ popScreen
-    TerminalScreen _ m  -> Just . (uvWorld . menuLayers %~ ( (TerminalScreen 0 m : ) . tail) )
+    TerminalScreen 0 _  -> popScreen
+    TerminalScreen _ m  -> Just . (menuLayers %~ ( (TerminalScreen 0 m : ) . tail) )
     InputScreen s       -> case scode of
-        ScancodeEscape  -> uvWorld $ popScreen
-        ScancodeReturn  -> uvWorld $ popScreen . applyTerminalString s
+        ScancodeEscape  -> popScreen
+        ScancodeReturn  -> popScreen . (over uvWorld $ applyTerminalString s)
         ScancodeBackspace 
-            -> uvWorld $ popScreen >=> pushScreen (InputScreen $ dropLast s)
-        _   -> uvWorld $ popScreen >=> pushScreen (InputScreen $ s ++ [scodeToChar scode])
+            -> popScreen >=> pushScreen (InputScreen $ dropLast s)
+        _   -> popScreen >=> pushScreen (InputScreen $ s ++ [scodeToChar scode])
   where 
     dropLast (x:xs) = init (x:xs)
     dropLast _      = []
-optionListToEffects :: [MenuOption] -> (World -> Maybe World) -> Scancode -> World -> Maybe World
+optionListToEffects :: [MenuOption] -> (Universe -> Maybe Universe) -> Scancode 
+    -> Universe -> Maybe Universe
 optionListToEffects mos defaulteff sc w = case lookup sc listEffects of
     Nothing -> defaulteff w
     Just eff -> eff w
   where
     listEffects = concatMap menuOptionToEffects mos
 
-menuOptionToEffects :: MenuOption -> [(Scancode,World -> Maybe World)]
+menuOptionToEffects :: MenuOption -> [(Scancode,Universe -> Maybe Universe)]
 menuOptionToEffects Toggle          {_moKey = k, _moEff = eff} = [(k,eff)]
 menuOptionToEffects InvisibleToggle {_moKey = k, _moEff = eff} = [(k,eff)]
 menuOptionToEffects Toggle2