Separate placement spot from placement type

src/Dodge/LevelGen.hs

@@ -24,12 +24,12 @@ import qualified Data.IntSet as IS
 
 placeSpot :: World -> ((Point2,Float) , Placement) -> World
 placeSpot w (shift, plmnt@Placement{}) =
-    let (i,w') =  placeSpotID (shiftPSBy shift (_placementSpot plmnt)) w
+    let (i,w') =  placeSpotID (shiftPSBy shift (_placementSpot plmnt)) (_psType plmnt) w
     in  maybe w' (curry (placeSpot w') shift) (_idPlacement plmnt i)
 placeSpot w (shift, PlacementPos p subpl) = placeSpot w (shift, subpl (shiftPoint3By shift p))
 
 shiftPlacement :: (Point2,Float) -> Placement -> Placement
-shiftPlacement shift (Placement ps f) = Placement (shiftPSBy shift ps)
+shiftPlacement shift (Placement ps pt f) = Placement (shiftPSBy shift ps) pt
      (fmap (fmap $ shiftPlacement shift) f)
 shiftPlacement shift (PlacementPos p f) = PlacementPos (shiftPoint3By shift p)
      (fmap (shiftPlacement shift) f)
@@ -41,8 +41,8 @@ shiftPSBy (pos,rot) ps = ps
 
 -- the Int here allows for passing parameters down to other placements:
 -- button ids, etc
-placeSpotID :: PlacementSpot -> World -> (Int, World)
-placeSpotID ps w = case _psType ps of
+placeSpotID :: PlacementSpot -> PSType -> World -> (Int, World)
+placeSpotID ps pt w = case pt of
     PutProp prop -> placeProp prop p rot w
     PutButton bt -> placeBt bt p rot w
     PutFlIt itm -> placeFlIt itm p rot w
@@ -50,7 +50,7 @@ placeSpotID ps w = case _psType ps of
     PutMachine col wallpoly mc -> placeMachine col (map doShift wallpoly) mc p rot w
     PutLS ls -> placeLS ls p' rot w
     PutPressPlate pp -> placePressPlate pp p rot w
-    RandPS rgen -> placeSpotID (set psType evaluatedType ps) (set randGen g w)
+    RandPS rgen -> placeSpotID ps evaluatedType (set randGen g w)
       where 
         (evaluatedType, g) = runState rgen (_randGen w)
     PutDoor col f pss -> placeDoor col f (map (bimap doShift doShift) pss) w