Cleanup

src/Dodge/Data.hs

@@ -70,7 +70,6 @@ module Dodge.Data
     , module Dodge.Item.Attachment.Data
     , module Dodge.Item.Data
     , module Dodge.Config.Data
-    , module Dodge.Equipment.Data
     , module MaybeHelp
     , module Dodge.Data.ItemAmount
     , module Dodge.RoomCluster.Data
@@ -165,7 +164,6 @@ import Dodge.Creature.Stance.Data
 import Dodge.Creature.Perception.Data
 import Dodge.Creature.Memory.Data
 import Dodge.Distortion.Data
-import Dodge.Equipment.Data
 import Dodge.Data.SoundOrigin
 import Dodge.Data.Damage
 import Dodge.Combine.Data
@@ -217,12 +215,13 @@ data World = World
     , _randGen :: StdGen
     , _toPlaySounds     :: M.Map SoundOrigin Sound
     , _playingSounds    :: M.Map SoundOrigin Sound
+    , _mousePos         :: Point2
+    , _keys             :: S.Set Scancode
+    , _mouseButtons     :: M.Map MouseButton Bool
+    , _hammers          :: M.Map WorldHammer HammerPosition
     }
 data CWorld = CWorld 
-    { _keys             :: S.Set Scancode
-    , _mouseButtons     :: M.Map MouseButton Bool
-    , _mousePos         :: Point2
-    , _cameraCenter     :: Point2
+    { _cameraCenter     :: Point2
     , _cameraRot        :: Float
     , _cameraZoom       :: Float  -- smaller values zoom out
     , _itemZoom         :: Float
@@ -236,7 +235,6 @@ data CWorld = CWorld
     , _creatureGroups   :: IM.IntMap CrGroupParams
     , _itemPositions    :: IM.IntMap ItemPos
     , _clouds           :: [Cloud]
-    --, _clZoning         :: Zoning [] Cloud
     , _clZoning         :: IM.IntMap (IM.IntMap [Cloud]) --Zoning IM.IntMap Creature
     , _gusts            :: IM.IntMap Gust
     , _gsZoning         :: IM.IntMap (IM.IntMap IS.IntSet)
@@ -244,8 +242,6 @@ data CWorld = CWorld
     , _projectiles      :: IM.IntMap Proj
     , _instantBullets   :: [Bullet]
     , _bullets          :: [Bullet]
---    , _instantParticles :: [Particle]
---    , _particles        :: [Particle]
     , _radarSweeps      :: [RadarSweep]
     , _energyBalls      :: [EnergyBall]
     , _posEvents        :: [PosEvent]
@@ -284,8 +280,6 @@ data CWorld = CWorld
     , _corpses          :: IM.IntMap Corpse
     , _clickMousePos    :: Point2
     , _pathGraph        :: Gr Point2 PathEdge
-    --, _pnZoning         :: Zoning [] (Int,Point2)
-    --, _peZoning         :: Zoning [] (Int,Int,PathEdge)
     , _pnZoning         :: IM.IntMap (IM.IntMap [(Int,Point2)]) --Zoning IM.IntMap Creature
     , _peZoning         :: IM.IntMap (IM.IntMap [(Int,Int,PathEdge)]) --Zoning IM.IntMap Creature
     , _hud              :: HUD
@@ -303,7 +297,6 @@ data CWorld = CWorld
     , _rewindWorlds     :: [CWorld]
     , _timeFlow         :: TimeFlowStatus
     , _worldClock       :: Int
-    , _hammers          :: M.Map WorldHammer HammerPosition
     , _backspaceTimer   :: Int
     , _genParams        :: GenParams
     , _deathDelay       :: Maybe Int