mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-29 04:42:18 -05:00
Code Issues Projects Releases Wiki Activity

Fixes issue where Check Tracker would auto-scroll to wrong location when entering a grotto

Browse Source
This commit is contained in:
sonoftunk 2022-11-06 11:06:15 -05:00
parent 44b7d72916
commit d481181170
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@ -719,8 +719,11 @@ void DrawLocations() {
bool doAreaScroll = false; bool doAreaScroll = false;
bool inGame = gGlobalCtx != nullptr && gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2; bool inGame = gGlobalCtx != nullptr && gSaveContext.fileNum >= 0 && gSaveContext.fileNum <= 2;
RandomizerCheckArea currentArea = RCAREA_INVALID; RandomizerCheckArea currentArea = RCAREA_INVALID;
if (gGlobalCtx != nullptr) SceneID sceneId = SCENE_ID_MAX;
currentArea = RandomizerCheckObjects::GetRCAreaBySceneID((SceneID)gGlobalCtx->sceneNum); if (gGlobalCtx != nullptr) {
sceneId = (SceneID)gGlobalCtx->sceneNum;
currentArea = RandomizerCheckObjects::GetRCAreaBySceneID(sceneId);
}
ImGui::BeginChild("ChildToCheckLocations", ImVec2(0, -8)); ImGui::BeginChild("ChildToCheckLocations", ImVec2(0, -8));
for (auto& [rcArea, rcObjects] : RandomizerCheckObjects::GetAllRCObjectsByArea()) { for (auto& [rcArea, rcObjects] : RandomizerCheckObjects::GetAllRCObjectsByArea()) {
@ -730,7 +733,9 @@ void DrawLocations() {
locationSearch.PassFilter(locationIt.second.rcSpoilerName.c_str())) { locationSearch.PassFilter(locationIt.second.rcSpoilerName.c_str())) {
hasItems = true; hasItems = true;
doAreaScroll = (currentArea != RCAREA_INVALID && currentArea != lastArea && currentArea == rcArea); doAreaScroll =
(currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos
currentArea != lastArea && currentArea == rcArea);
break; break;
} }
} }
@ -804,7 +809,9 @@ void DrawLocations() {
for (auto& locationIt : rcObjects) { for (auto& locationIt : rcObjects) {
if (locationIt.second.visibleInImgui && checkedLocations.count(locationIt.second.rc)) { if (locationIt.second.visibleInImgui && checkedLocations.count(locationIt.second.rc)) {
hasItems = true; hasItems = true;
doAreaScroll = (currentArea != RCAREA_INVALID && currentArea != lastArea && currentArea == rcArea); doAreaScroll =
(currentArea != RCAREA_INVALID && sceneId != SCENE_KAKUSIANA && // Don't move for grottos
currentArea != lastArea && currentArea == rcArea);
break; break;
} }
} }
@ -849,6 +856,7 @@ void DrawLocations() {
ImGui::EndChild(); ImGui::EndChild();
ImGui::EndTable(); ImGui::EndTable();
if (sceneId != SCENE_KAKUSIANA)
lastArea = currentArea; lastArea = currentArea;
} }
} }