github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 13:00:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check Tracker - Fixes Bazaar showing under wrong area on tracker between adult/child

Browse source
This commit is contained in:
sonoftunk 2022-11-13 10:43:37 -05:00
commit 8ca1dbeb8a
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View file

@ -744,6 +744,7 @@ void DrawLocations() {
doAreaScroll = doAreaScroll =
(currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos (currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos
sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains
sceneId != SCENE_SHOP1 && // Don't move for Bazaar, as it moves between Kak and Market
currentArea != lastArea && currentArea == rcArea); currentArea != lastArea && currentArea == rcArea);
break; break;
} }
@ -827,6 +828,7 @@ void DrawLocations() {
doAreaScroll = doAreaScroll =
(currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for kakusiana/grottos (currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for kakusiana/grottos
sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO && // Don't move for fairy fountains
sceneId != SCENE_SHOP1 && //Don't move for Bazaar, as it moves between Kak and Market
currentArea != lastArea && currentArea == rcArea); currentArea != lastArea && currentArea == rcArea);
break; break;
} }
@ -875,7 +877,10 @@ void DrawLocations() {
ImGui::EndChild(); ImGui::EndChild();
ImGui::EndTable(); ImGui::EndTable();
if (sceneId != SCENE_KAKUSIANA && sceneId != SCENE_YOUSEI_IZUMI_TATE && sceneId != SCENE_YOUSEI_IZUMI_YOKO) if (sceneId != SCENE_KAKUSIANA &&
sceneId != SCENE_YOUSEI_IZUMI_TATE &&
sceneId != SCENE_YOUSEI_IZUMI_YOKO &&
sceneId != SCENE_SHOP1)
lastArea = currentArea; lastArea = currentArea;
} }
} }