Move configuration from world to universe

2021-11-28 22:30:47 +00:00
parent 45ba120796
commit 8c5777a1af
29 changed files with 343 additions and 300 deletions
@@ -74,18 +74,18 @@ defaultWorld = World
        ]
    , _selLocation = 0
    --, _keyConfig = defaultKeyConfigSDL
-    , _config       = defaultConfig
+--    , _config       = defaultConfig
    , _sideEffects  = return
    , _inventoryMode = TopInventory
    , _foregroundShape = mempty
    , _distortions     = []
    , _gameRooms = []
--    , _preloadData = DummyPdata -- hack TODO remove this
-    , _frameClock = 0
+    , _worldClock = 0
    , _worldBounds = defaultBounds
    , _rewindWorlds = []
    , _rewinding = False
    , _lSelHammerPosition = HammerUp
+    , _worldTerminal = Nothing'
    }
 youLight :: TempLightSource
 youLight =