Cleanup, move towards unifying zones

src/Dodge/LevelGen/MoveDoor.hs

@@ -6,8 +6,10 @@ module Dodge.LevelGen.MoveDoor
     , addSoundToDoor
     ) where
 import Dodge.Data
+import Dodge.Data.SoundOrigin
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
+import Dodge.Zone.Data
 import Dodge.SoundLogic
 import Dodge.SoundLogic.Synonyms
 import Geometry
@@ -58,7 +60,7 @@ changeZonedWall
     -> (Int,Int)
     -> World
     -> World
-changeZonedWall eff n (x,y) = over wallsZone $ adjustIMZone eff x y n
+changeZonedWall eff n (x,y) = over (wallsZone . znObjects) $ adjustIMZone eff x y n
 
 addSoundToDoor :: Int -> Point2 -> Point2 -> [Wall] -> [Wall]
 addSoundToDoor _   _   _ [] = error "When creating door tried to add sound to nothing"