Cleanup, move towards unifying zones

src/Dodge/WorldEvent/ThingsHit.hs

@@ -5,7 +5,8 @@ module Dodge.WorldEvent.ThingsHit
     where
 import Dodge.Data
 import Dodge.Base
-import Dodge.Base.Zone
+import Dodge.Zone
+import Dodge.Zone.Data
 import Geometry
 
 import qualified Data.IntMap.Strict as IM
@@ -27,7 +28,7 @@ thingsHit sp ep w
     --    $ creaturesAlongLine sp ep w
     crPs     = map (\cr -> ssaTriPoint ep (_crPos cr) sp (_crRad cr)) hitCrs
     crs   = zip crPs (map E3x1 hitCrs)
-    hitWls   = wallsOnLine sp ep (IM.unions [f b $ f a $ _wallsZone w | a<-[x-1,x,x+1]
+    hitWls   = wallsOnLine sp ep (IM.unions [f b $ f a $ _znObjects $ _wallsZone w | a<-[x-1,x,x+1]
                                                                       , b<-[y-1,y,y+1]])
     (x,y) = zoneOfPoint (0.5 *.* (sp +.+ ep))
     f i m = case IM.lookup i m of