Move universe IO effects outside of world

src/Dodge/Event/Keyboard.hs

@@ -79,22 +79,24 @@ handlePressedKey _   scode u = case scode of
     _ | null (_menuLayers u) -> case u ^? uvWorld . hud . hudElement . subInventory of
         Just (DisplayTerminal tmid) | inTermFocus (_uvWorld u) 
           -> return $ uvWorld (Just . handlePressedKeyTerminal tmid scode) u
-        _ -> return $ uvWorld (Just . handlePressedKeyInGame scode)        u
+        _ -> return $ (Just . handlePressedKeyInGame scode)        u
     _ -> handlePressedKeyInMenu (head $ _menuLayers u) scode u
 
-handlePressedKeyInGame :: Scancode -> World -> World
-handlePressedKeyInGame scode w = case scode of
-    ScancodeEscape  -> pauseGame $ escapeMap w
-    ScancodeSpace   -> spaceAction w
-    ScancodeP       -> pauseGame $ escapeMap w
-    ScancodeF       -> youDropItem w
-    ScancodeM       -> toggleMap w
-    ScancodeR       -> crToggleReloading (you w) w
-    ScancodeT       -> testEvent w
-    ScancodeX       -> w & hud . hudElement %~ toggleTweakInv
-    ScancodeC       -> toggleCombineInv w
-    ScancodeI       -> w & hud . hudElement %~ toggleInspectInv
-    _               -> w
+handlePressedKeyInGame :: Scancode -> Universe -> Universe
+handlePressedKeyInGame scode uv = case scode of
+    ScancodeEscape  -> pauseGame $ over uvWorld escapeMap uv
+    ScancodeSpace   -> over uvWorld spaceAction uv
+    ScancodeP       -> pauseGame $ over uvWorld escapeMap uv
+    ScancodeF       -> over uvWorld youDropItem uv
+    ScancodeM       -> over uvWorld toggleMap uv
+    ScancodeR       -> over uvWorld (crToggleReloading (you w)) uv
+    ScancodeT       -> over uvWorld testEvent uv
+    ScancodeX       -> uv & uvWorld . hud . hudElement %~ toggleTweakInv
+    ScancodeC       -> over uvWorld toggleCombineInv uv
+    ScancodeI       -> uv & uvWorld . hud . hudElement %~ toggleInspectInv
+    _               -> uv
+  where
+    w = _uvWorld uv
 
 
 handlePressedKeyTerminal :: Int -> Scancode -> World -> World
@@ -138,8 +140,8 @@ spaceAction w = case _hudElement $ _hud w of
     theLoc = doWorldPos (fst (_seenLocations w IM.! _selLocation w)) w
 --    updateTopCloseObject i w' = w' & closeObjects %~ ( Right (_buttons w' IM.! i) : ) . tail
 
-pauseGame :: World -> World
-pauseGame w = w & sideEffects %~ (. (menuLayers .~ [pauseMenu]))
+pauseGame :: Universe -> Universe
+pauseGame = menuLayers .~ [pauseMenu]
 
 toggleMap :: World -> World
 toggleMap w = case _hudElement $ _hud w of