From 52657e9eaa7520a841f0eb384472dbde6522e748 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Wed, 17 Jul 2024 14:07:35 -0400 Subject: Fix pilgrimage detection allowing sunwarps when shuffled --- src/tracker_state.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/tracker_state.cpp') diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp index ba615d1..bd63076 100644 --- a/src/tracker_state.cpp +++ b/src/tracker_state.cpp @@ -180,7 +180,8 @@ class StateCalculator { std::list panel_boundary; std::list painting_boundary; std::list flood_boundary; - flood_boundary.push_back({.destination_room = options_.start}); + flood_boundary.push_back( + {.source_room = -1, .destination_room = options_.start}); bool reachable_changed = true; while (reachable_changed) { @@ -282,12 +283,11 @@ class StateCalculator { if (AP_GetSunwarpMapping().count(index)) { const SunwarpMapping& sm = AP_GetSunwarpMapping().at(index); - Exit sunwarp_exit; - sunwarp_exit.destination_room = - GD_GetRoomForSunwarp(sm.exit_index); - sunwarp_exit.door = GD_GetSunwarpDoors().at(sm.dots - 1); - - new_boundary.push_back(sunwarp_exit); + new_boundary.push_back( + {.source_room = room_exit.destination_room, + .destination_room = GD_GetRoomForSunwarp(sm.exit_index), + .door = GD_GetSunwarpDoors().at(sm.dots - 1), + .type = EntranceType::kSunwarp}); } } } -- cgit 1.4.1