Cleanup

src/Dodge/Default/World.hs

@@ -15,16 +15,18 @@ defaultWorld = World
     , _toPlaySounds = M.empty
     , _playingSounds = M.empty
     , _randGen = mkStdGen 2
+    , _keys             = S.empty
+    , _mouseButtons     = mempty
+    , _mousePos = V2 0 0
+    , _hammers = defaultWorldHammers
     }
 
 defaultCWorld :: CWorld
 defaultCWorld = CWorld
-    { _keys             = S.empty
-    , _magnets          = IM.empty
-    , _mouseButtons     = mempty
-    , _cameraCenter     = V2 0 0
+    { _cameraCenter     = V2 0 0
     , _cameraRot        = 0
     , _cameraZoom       = 1
+    , _magnets          = IM.empty
     , _itemZoom         = 1
     , _defaultZoom      = 1
     , _cameraViewFrom   = V2 0 0
@@ -70,7 +72,6 @@ defaultCWorld = CWorld
     , _wlZoning     = IM.empty --Zoning IM.empty wlZoneSize zoneOfWall
     , _floorItems = IM.empty
     , _floorTiles = []
-    , _mousePos = V2 0 0
     , _yourID = 0
     , _worldEvents = []
     , _delayedEvents = []
@@ -109,7 +110,6 @@ defaultCWorld = CWorld
     , _maybeWorld = Nothing'
     , _rewindWorlds = []
     , _timeFlow = NormalTimeFlow
-    , _hammers = defaultWorldHammers
     , _backspaceTimer = 0
     , _genParams = GenParams M.empty
 --    , _genPlacements = IM.empty