Slight cleanup of placement spots

src/Dodge/Layout.hs

@@ -53,7 +53,8 @@ generateLevelFromRoomList gr w
   where
     path = pairsToGraph dist pairPath
     pairPath = concatMap _rmPath rs
-    plmnts = concat . snd $ mapAccumR assignPlacementSpots (_randGen w) rs
+    plmnts = concatMap (\rm -> map (rm,) (_rmPS rm)) rs
+    --plmnts = concat . snd $ mapAccumR assignPlacementSpots (_randGen w) rs
     rs = zipWith addTile zs . evalState gr $ _randGen w
     zs = map fromIntegral $ randomRs (0,63::Int) $ _randGen w
 
@@ -63,18 +64,14 @@ generateLevelFromRoomList gr w
 -- first it takes the random placements and derandomises them
 -- then it deals with link placement spots
 -- TODO use state monad here
-assignPlacementSpots :: StdGen -> Room -> (StdGen, [((Point2,Float),Placement)])
+assignPlacementSpots :: StdGen -> Room -> (StdGen, [(Room,Placement)])
 assignPlacementSpots g rm = (g'
-    , map (_rmShift rm,) 
+    , map (rm,) 
     $ plmnts ++ updatedLnkPlmnts
     )
   where
-    (randPlmnts, detPlmnts) = partition isRand (_rmPS rm)
-    isRand RandomPlacement{} = True
-    isRand _ = False
     (unrandPlmnts, g'') = runState (mapM (derandPlacement rm) (_rmPS rm)) g
     (lnkplmnts, plmnts) = partition islnk unrandPlmnts
-    --(lnkplmnts, plmnts) = partition islnk (unrandPlmnts ++ detPlmnts)
     islnk Placement{_placementSpot=PSLnk{}} = True
     islnk _ = False
     (shuffledLnks,g') = runState (shuffle $ _rmLinks rm) g''