Move saved worlds outside of world into universe

2021-11-28 14:42:08 +00:00
parent 1c5abfd6f2
commit 1d9dd3e4e0
8 changed files with 19 additions and 20 deletions
@@ -56,6 +56,7 @@ data Universe = Universe
    { _uvWorld :: World
    , _preloadData          :: PreloadData
    , _menuLayers           :: [ScreenLayer]
+    , _savedWorlds          :: M.Map SaveSlot World
    }
 data World = World 
    { _keys                 :: !(S.Set Scancode)
@@ -116,7 +117,6 @@ data World = World
    , _gameRooms            :: [GameRoom] -- consider using and IntMap
    , _keyConfig            :: KeyConfigSDL
    , _config               :: Configuration
-    , _savedWorlds          :: M.Map SaveSlot World
    , _rewindWorlds         :: [World]
    , _rewinding            :: Bool
    , _frameClock           :: Int
@@ -131,7 +131,7 @@ data ScreenLayer
    = OptionScreen
        { _scTitle   :: Universe -> String
        , _scOptions :: [MenuOption]
-        , _scDefaultEff :: Universe -> Maybe Universe
+        , _scDefaultEff :: Universe -> Maybe Universe -- IO (Maybe Universe)?
        , _scOptionFlag :: OptionScreenFlag
        }
    | ColumnsScreen String [(String,String)]