diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-07-24 09:40:22 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-07-24 09:40:22 -0400 |
commit | c443acfd0b25b3e4f3446f795777b8dd18b00e2b (patch) | |
tree | 86340c00f1723310cbab02f0ebc496b25a780278 /src/tracker_state.cpp | |
parent | 378766bcee3cad04256ada937f96b232aba85cf3 (diff) | |
parent | ab5206255603f6401d9c216ffce26607da16ad33 (diff) | |
download | lingo-ap-tracker-c443acfd0b25b3e4f3446f795777b8dd18b00e2b.tar.gz lingo-ap-tracker-c443acfd0b25b3e4f3446f795777b8dd18b00e2b.tar.bz2 lingo-ap-tracker-c443acfd0b25b3e4f3446f795777b8dd18b00e2b.zip |
Merge branch 'main' into panels
Diffstat (limited to 'src/tracker_state.cpp')
-rw-r--r-- | src/tracker_state.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp index 66a9f94..18bb499 100644 --- a/src/tracker_state.cpp +++ b/src/tracker_state.cpp | |||
@@ -194,7 +194,8 @@ class StateCalculator { | |||
194 | std::list<int> panel_boundary; | 194 | std::list<int> panel_boundary; |
195 | std::list<int> painting_boundary; | 195 | std::list<int> painting_boundary; |
196 | std::list<Exit> flood_boundary; | 196 | std::list<Exit> flood_boundary; |
197 | flood_boundary.push_back({.destination_room = options_.start}); | 197 | flood_boundary.push_back( |
198 | {.source_room = -1, .destination_room = options_.start}); | ||
198 | 199 | ||
199 | bool reachable_changed = true; | 200 | bool reachable_changed = true; |
200 | while (reachable_changed) { | 201 | while (reachable_changed) { |
@@ -296,12 +297,11 @@ class StateCalculator { | |||
296 | if (AP_GetSunwarpMapping().count(index)) { | 297 | if (AP_GetSunwarpMapping().count(index)) { |
297 | const SunwarpMapping& sm = AP_GetSunwarpMapping().at(index); | 298 | const SunwarpMapping& sm = AP_GetSunwarpMapping().at(index); |
298 | 299 | ||
299 | Exit sunwarp_exit; | 300 | new_boundary.push_back( |
300 | sunwarp_exit.destination_room = | 301 | {.source_room = room_exit.destination_room, |
301 | GD_GetRoomForSunwarp(sm.exit_index); | 302 | .destination_room = GD_GetRoomForSunwarp(sm.exit_index), |
302 | sunwarp_exit.door = GD_GetSunwarpDoors().at(sm.dots - 1); | 303 | .door = GD_GetSunwarpDoors().at(sm.dots - 1), |
303 | 304 | .type = EntranceType::kSunwarp}); | |
304 | new_boundary.push_back(sunwarp_exit); | ||
305 | } | 305 | } |
306 | } | 306 | } |
307 | } | 307 | } |