nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix bad merge conflict resolution

Browse Source
This commit is contained in:
aMannus
2025-10-21 00:25:39 +02:00
parent 37409ca2b4
commit bae8deb473
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@@ -261,9 +261,10 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
} }
auto loc = Rando::Context::GetInstance()->GetItemLocation(rc); auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
if (rc != RC_HF_OCARINA_OF_TIME_ITEM) { if (rc != RC_HF_OCARINA_OF_TIME_ITEM) {
if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) {
Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED); Rando::Context::GetInstance()->GetItemLocation(rc)->SetCheckStatus(RCSHOW_COLLECTED);
return; return;
}
} }
SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc)); SPDLOG_INFO("Queuing RC: {}", static_cast<uint32_t>(rc));
randomizerQueuedChecks.push(rc); randomizerQueuedChecks.push(rc);