Cleanup, move towards unifying zones

src/Dodge/Data.hs

@@ -4,17 +4,11 @@ different modules because they are interdependent;
 circular imports are probably not a good idea.
  -}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE StrictData #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE DeriveGeneric #-}
 module Dodge.Data 
-    ( module Dodge.Data
-    , module Dodge.Data.DamageType
-    , module Dodge.Data.SoundOrigin
-    , Point2 
-    , Sound (..)
-    , soundTime
-    ) where
+    where
 import Dodge.Creature.State.Data
 import Dodge.Creature.Stance.Data
 import Dodge.Creature.Perception.Data
@@ -22,6 +16,7 @@ import Dodge.Creature.Memory.Data
 import Dodge.Debug.Flag.Data
 import Dodge.Data.SoundOrigin
 import Dodge.Data.DamageType
+import Dodge.Zone.Data
 import Dodge.Config.Data
 import Dodge.Config.KeyConfig
 import Dodge.Item.Attachment.Data
@@ -55,17 +50,15 @@ data World = World
     , _cameraZoom           :: !Float
     , _cameraViewFrom       :: !Point2
     , _creatures            :: IM.IntMap Creature
-    , _creaturesZone        :: IM.IntMap (IM.IntMap (IM.IntMap Creature))
+    , _creaturesZone        :: Zone (IM.IntMap Creature)
     , _creatureGroups       :: IM.IntMap CrGroupParams
     , _itemPositions        :: IM.IntMap ItemPos
     , _clouds               :: [Cloud]
-    , _cloudsZone           :: IM.IntMap (IM.IntMap [Cloud])
+    , _cloudsZone           :: Zone [Cloud]
     , _projectiles          :: IM.IntMap Projectile
     , _particles            :: ![Particle]
-    , _staticWalls          :: IM.IntMap (IM.IntMap [Wall'])
-    , _seenStaticWalls      :: IM.IntMap (IM.IntMap [Wall'])
     , _walls                :: !(IM.IntMap Wall)
-    , _wallsZone            :: IM.IntMap (IM.IntMap (IM.IntMap Wall))
+    , _wallsZone            :: Zone (IM.IntMap Wall)
     , _forceFields          :: IM.IntMap ForceField
     , _floorItems           :: IM.IntMap FloorItem
     , _floorTiles           :: [(Point3,Point3)]
@@ -81,12 +74,11 @@ data World = World
     , _decorations          :: IM.IntMap Picture
     , _foregroundDecorations :: [Polyhedra]
     , _foregroundEdgeVerx   :: [Point3]
-    , _corpses              :: IM.IntMap (IM.IntMap [Corpse])
+    , _corpses              :: Zone [Corpse]
     , _clickMousePos        :: !Point2
     , _pathGraph            :: ~(Gr Point2 Float)
     , _pathGraph'           :: ~[(Point2,Point2)]
     , _pathPoints           :: ~(IM.IntMap (IM.IntMap [(Int,Point2)]))
-    , _pathInc              :: ~(M.Map Point2 [Point2])
     , _storedLevel          :: Maybe World
     , _menuLayers           :: [ScreenLayer]
     , _worldState           :: M.Map WorldState Bool