Commit towards merge

src/Dodge/Room/Procedural.hs

@@ -170,6 +170,7 @@ quarterRoomTri w = do
             ]
         , _rmBound  = [[V2 0 0,V2 w w,V2 (-w) w]]
         }
+
 quarterRoomSquare :: RandomGen g => Float -> State g Room
 quarterRoomSquare w = do
     b <- takeOne 
@@ -183,8 +184,9 @@ quarterRoomSquare w = do
             , blockLine (V2 0 w) (V2 0 (w*2))
             ]
         ]
+    let thepoly = [ map toV2 [(0,0),(w,w),(0,2*w),(-w,w)] ]
     pure $ defaultRoom
-        { _rmPolys  = [ map toV2 [(0,0),(w,w),(0,2*w),(-w,w)] ]
+        { _rmPolys  = thepoly
         , _rmLinks  = map toBothLnk
             [ (V2 (w/2) (3*w/2), negate $ pi/4)
             , (V2 (negate $ w/2) (3*w/2), pi/4)
@@ -204,7 +206,8 @@ quarterRoomSquare w = do
         , _rmPmnts = b ++ [ blockLine (V2 (w/2) (w/2)) (V2 0 w) ]
         , _rmPos = [ RoomPos p pi S.empty NotLink 0 
                     | p <- [V2 20 (2*w-40),V2 25 (2*w-45)] ]
-        , _rmBound = [map toV2 [(w,w),(0,2*w),(-w,w)]]
+        --, _rmBound = [map toV2 [(w,w),(0,2*w),(-w,w)]]
+        , _rmBound = thepoly
         }
 {- | Randomise the ordering of placements in a room.
 Useful for randomising the position of generic placements such as 'PutNothing'. -}