Start unifying door placement types

2025-10-24 22:13:30 +01:00
parent 6457f00ba7
commit b6736e2735
7 changed files with 118 additions and 103 deletions
@@ -135,9 +135,9 @@ placeSpotID rid ps pt w = case pt of
    PutLS ls -> plNewUpID (gwWorld . cWorld . lWorld . lightSources) lsID (mvLS p' rot ls) w
    RandPS _ -> error "RandPS should not be reachable here" --evaluateRandPS rid rgn ps w
    PutDoor f l p1 p2 -> plDoor f l (pashift p1) (pashift p2) w
+    PutDoor' dr wl -> plDoor' (dr & drZeroPos %~ pashift & drOnePos %~ pashift) wl w
+    PutSlideDr wl dr off a b -> plSlideDoor wl dr off (doShift a) (doShift b) w
    PutCoord cp -> plNewID (gwWorld . coordinates) (doShift cp) w
-    PutSlideDr wl dr off a b ->
-        plSlideDoor wl dr off (doShift a) (doShift b) w
    PutBlock bl wl ps' ->
        plBlock
            (map doShift ps')