Fix reloading of start of level

src/Dodge/Menu.hs

@@ -1,6 +1,7 @@
 module Dodge.Menu
     where
 import Dodge.Data
+import Dodge.Save
 import Dodge.Config.Data
 import Dodge.Config.Update
 import SDL
@@ -14,7 +15,6 @@ import Dodge.SoundLogic
 import Picture
 
 import Control.Lens
-import Data.Maybe
 optionMenu :: ScreenLayer
 optionMenu = OptionScreen
     { _scTitle = const "OPTIONS"
@@ -131,7 +131,7 @@ pauseMenu = OptionScreen
 pauseMenuOptions :: [MenuOption]
 pauseMenuOptions =
     [ Toggle ScancodeN startNewGame (const "NEW LEVEL")
-    , Toggle ScancodeR (\w -> return $ fromMaybe w $ _storedLevel w) (const "RESTART")
+    , Toggle ScancodeR (Just . loadStoredLevel) (const "RESTART")
     , Toggle ScancodeO (pushScreen optionMenu ) (const "OPTIONS")
     , Toggle ScancodeC (pushScreen displayControls) (const "CONTROLS")
     , InvisibleToggle ScancodeEscape (const Nothing)
@@ -174,11 +174,6 @@ levelMenu x = OptionScreen
 unpause :: World -> Maybe World
 unpause w = Just . resumeSound $ w {_menuLayers = []}
 
-storeLevel :: World -> World
-storeLevel w = case _storedLevel w of
-    Nothing -> w & storedLevel ?~ w
-    _       -> w
-
 displayControls :: ScreenLayer
 displayControls = DisplayScreen
     {_scDisplay = \w -> pictures