Move toward better info display during level generation

2021-11-10 23:40:04 +00:00
parent 9aefc11e17
commit a195157e54
13 changed files with 122 additions and 118 deletions
@@ -82,7 +82,6 @@ data World = World
    , _pathGraph            :: ~(Gr Point2 Float)
    , _pathGraphP           :: ~[(Point2,Point2)]
    , _pathPoints           :: ~(IM.IntMap (IM.IntMap [(Int,Point2)]))
-    , _savedWorlds          :: M.Map SaveSlot World
    , _menuLayers           :: [ScreenLayer]
    , _worldFlags           :: S.Set WorldFlag
    , _carteDisplay         :: !Bool
@@ -94,16 +93,17 @@ data World = World
    , _closeActiveObjects   :: [Either FloorItem Button]
    , _seenLocations        :: IM.IntMap (World -> Point2,String)
    , _selLocation          :: Int
-    , _keyConfig            :: KeyConfigSDL
-    , _config               :: Configuration
    , _sideEffects          :: World -> IO World
    , _inventoryMode        :: InventoryMode
    , _lClickHammer         :: HammerPosition
    , _radDistortion        :: [(Point2,Point2,Point2,Float)]
-    , _gameRooms            :: [GameRoom]
-    , _preloadData          :: PreloadData
-    , _frameClock           :: Int
    , _worldBounds          :: Bounds
+    , _gameRooms            :: [GameRoom]
+    , _keyConfig            :: KeyConfigSDL
+    , _config               :: Configuration
+    , _preloadData          :: PreloadData
+    , _savedWorlds          :: M.Map SaveSlot World
+    , _frameClock           :: Int
    }
 data SaveSlot = QuicksaveSlot | LevelStartSlot
  deriving (Eq,Ord)