Cleanup

src/Dodge/Layout.hs

@@ -86,22 +86,7 @@ doInPlacements w =
 doRoomInPlacements :: GenWorld -> Room -> (GenWorld, Room)
 doRoomInPlacements w rm = foldr f (w, rm) $ _rmInPmnt rm
   where
-    f plf (w', r') =  placeSpot (w', r') (plf (w'))
-
---doOutPlacements :: GenWorld -> GenWorld
---doOutPlacements w =
---    let ((pmnts, gw), rms) = mapAccumR doRoomOutPlacements (IM.empty, w) (_genRooms w)
---     in gw & genRooms .~ rms & genPmnt <>~ pmnts
-
---doRoomOutPlacements ::
---    (IM.IntMap [Placement], GenWorld) ->
---    Room ->
---    ((IM.IntMap [Placement], GenWorld), Room)
---doRoomOutPlacements imw r = foldr f (imw, r) $ IM.toList $ _rmOutPmnt r
---  where
---    f (i, pl) ((im, w), rm) =
---        let ((neww, newrm), plmnts) = placeSpot (w, rm) pl
---         in ((IM.insert i plmnts im, neww), newrm)
+    f plf (w', r') =  placeSpot (w', r') (plf w')
 
 doIndividualPlacements :: GenWorld -> GenWorld
 doIndividualPlacements gw =
@@ -109,7 +94,7 @@ doIndividualPlacements gw =
      in gw' & genRooms .~ rms
 
 doRoomPlacements :: GenWorld -> Room -> (GenWorld, Room)
-doRoomPlacements w rm = foldl' (\wr -> placeSpot wr) (w, rm & rmPmnts .~ mempty) 
+doRoomPlacements w rm = foldl' placeSpot (w, rm & rmPmnts .~ mempty) 
     $ _rmPmnts rm
 
 setupWorldBounds :: World -> World