about summary refs log tree commit diff stats
path: root/src/tracker_state.cpp
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2025-08-03 11:32:34 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2025-08-03 11:32:34 -0400
commita0a28f1f01c27c65d63661dd3374d5e54ec3ac1d (patch)
tree806af0448bbefa37a1ef176abd0167ab26a05c58 /src/tracker_state.cpp
parentc40971cbae7ba2fb0fb22ac1a5cbcc5ac25eed6b (diff)
parent92b91d6703c96f1724168e5e4845cfba6c802de4 (diff)
downloadlingo-ap-tracker-a0a28f1f01c27c65d63661dd3374d5e54ec3ac1d.tar.gz
lingo-ap-tracker-a0a28f1f01c27c65d63661dd3374d5e54ec3ac1d.tar.bz2
lingo-ap-tracker-a0a28f1f01c27c65d63661dd3374d5e54ec3ac1d.zip
Merge branch 'future' HEAD main
Diffstat (limited to 'src/tracker_state.cpp')
-rw-r--r--src/tracker_state.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp index bf2725a..674f68a 100644 --- a/src/tracker_state.cpp +++ b/src/tracker_state.cpp
@@ -342,7 +342,7 @@ class StateCalculator {
342 new_boundary.push_back( 342 new_boundary.push_back(
343 {.source_room = room_exit.destination_room, 343 {.source_room = room_exit.destination_room,
344 .destination_room = GD_GetRoomByName("Color Hallways"), 344 .destination_room = GD_GetRoomByName("Color Hallways"),
345 .type = EntranceType::kPainting}); 345 .type = EntranceType::kStaticPainting});
346 } 346 }
347 347
348 if (AP_IsPilgrimageEnabled()) { 348 if (AP_IsPilgrimageEnabled()) {
@@ -368,7 +368,7 @@ class StateCalculator {
368 .destination_room = GD_GetRoomByName("Pilgrim Antechamber"), 368 .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
369 .door = 369 .door =
370 GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"), 370 GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"),
371 .type = EntranceType::kPainting}); 371 .type = EntranceType::kStaticPainting});
372 } 372 }
373 } 373 }
374 374
@@ -650,7 +650,8 @@ class StateCalculator {
650 !AP_DoesPilgrimageAllowRoofAccess()) { 650 !AP_DoesPilgrimageAllowRoofAccess()) {
651 return kNo; 651 return kNo;
652 } 652 }
653 if (room_exit.type == EntranceType::kPainting && 653 if ((room_exit.type == EntranceType::kPainting ||
654 room_exit.type == EntranceType::kStaticPainting) &&
654 !AP_DoesPilgrimageAllowPaintings()) { 655 !AP_DoesPilgrimageAllowPaintings()) {
655 return kNo; 656 return kNo;
656 } 657 }