Locate bug in wall zoning

src/Dodge/LevelGen/MoveDoor.hs

@@ -16,20 +16,20 @@ import qualified Data.IntMap.Strict as IM
 import Control.Lens
 
 -- This deserves a clean up
-mvP :: Point2 -> Point2 -> Point2
+mvP :: Float -> Point2 -> Point2 -> Point2
 {-# INLINE mvP #-}
-mvP !ep !p = mvPointTowardAtSpeed 2 ep p
+mvP !speed !ep !p = mvPointTowardAtSpeed speed ep p
 
-mvPs :: (Point2,Point2) -> (Point2,Point2) -> (Point2,Point2)
+mvPs :: Float -> (Point2,Point2) -> (Point2,Point2) -> (Point2,Point2)
 {-# INLINE mvPs #-}
-mvPs (!ex,!ey) (!sx,!sy) = (mvP ex sx,mvP ey sy)
+mvPs !speed (!ex,!ey) (!sx,!sy) = (mvP speed ex sx,mvP speed ey sy)
 
 moveDoorToward :: Float -> (Point2,Point2) -> Wall -> Wall
 {-# INLINE moveDoorToward #-}
---moveDoorToward speed (ex,ey) wls = wls & wlLine %~ mvPs (ex,ey)
-moveDoorToward speed (ex,ey) wls = wls & wlLine %~ bimap (f ex) (f ey)
-  where
-    f !p = mvPointTowardAtSpeed speed p
+moveDoorToward speed (ex,ey) wls = wls & wlLine %~ mvPs speed (ex,ey)
+--moveDoorToward !speed !(!ex,!ey) wls = wls & wlLine %~ bimap (f ex) (f ey)
+--  where
+--    f !p = mvPointTowardAtSpeed speed p
 
 zoneps :: (Point2, Point2) -> [(Int,Int)]
 {-# INLINE zoneps #-}
@@ -61,7 +61,7 @@ changeZonedWall
 changeZonedWall eff n (x,y) = over wallsZone $ adjustIMZone eff x y n
 
 addSoundToDoor :: Int -> Point2 -> Point2 -> [Wall] -> [Wall]
-addSoundToDoor _ _   _   [] = error "When creating door tried to add sound to nothing"
+addSoundToDoor _   _   _ [] = error "When creating door tried to add sound to nothing"
 addSoundToDoor i pld hwd (x:ys) = f x : ys
   where
     f wl = over doorMech g wl
@@ -71,4 +71,4 @@ addSoundToDoor i pld hwd (x:ys) = f x : ys
                         = soundFrom (WallSound i) wp doorSound (Just 1) $ dm w
             | otherwise = dm w
           where 
-            wp = snd $ _wlLine (_walls w IM.! i)
+            wp = fst $ _wlLine (_walls w IM.! i)