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

Added queueing up song of time check when getting the ocarina of time check when its already been checked remotely

Browse Source
This commit is contained in:
Jerom Venneker
2025-08-04 21:27:17 +02:00
parent 799e2c2d5a
commit a72660959c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,9 +257,10 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF))
return; return;
auto loc = Rando::Context::GetInstance()->GetItemLocation(rc); auto loc = Rando::Context::GetInstance()->GetItemLocation(rc);
if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE) if(rc != RC_HF_OCARINA_OF_TIME_ITEM) {
return; if (loc == nullptr || loc->HasObtained() || loc->GetPlacedRandomizerGet() == RG_NONE)
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);
} }
@@ -301,6 +302,12 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) {
inSameArea = scene == gPlayState->sceneNum; inSameArea = scene == gPlayState->sceneNum;
} }
// setting the ocarinina obtained event flag
if(rc == RC_HF_OCARINA_OF_TIME_ITEM) {
randomizerQueuedChecks.push(rc);
return;
}
std::string logMessage = ""; std::string logMessage = "";
switch (loc->GetCollectionCheck().type) { switch (loc->GetCollectionCheck().type) {
@@ -375,6 +382,10 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet); getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
} }
if(rc == RC_HF_OCARINA_OF_TIME_ITEM && loc->HasObtained()) {
RandomizerOnExternalCheckHandler(RC_SONG_FROM_OCARINA_OF_TIME);
}
if (loc->HasObtained()) { if (loc->HasObtained()) {
SPDLOG_INFO("RC {} already obtained, skipping", static_cast<uint32_t>(rc)); SPDLOG_INFO("RC {} already obtained, skipping", static_cast<uint32_t>(rc));
} else { } else {