Push preloaddata into the universe

2021-11-28 12:01:06 +00:00
parent 2fd2929bdf
commit 98e0ea971a
5 changed files with 31 additions and 31 deletions
@@ -54,6 +54,7 @@ import Data.Monoid
 type CRUpdate = Creature -> World -> (Endo World, Maybe Creature)
 data Universe = Universe
    { _uvWorld :: World
+    , _preloadData          :: PreloadData
    }
 data World = World 
    { _keys                 :: !(S.Set Scancode)
@@ -115,7 +116,6 @@ data World = World
    , _gameRooms            :: [GameRoom] -- consider using and IntMap
    , _keyConfig            :: KeyConfigSDL
    , _config               :: Configuration
-    , _preloadData          :: PreloadData
    , _savedWorlds          :: M.Map SaveSlot World
    , _rewindWorlds         :: [World]
    , _rewinding            :: Bool