From 4aacc1bc0c17ad73a0545d9dfc7721283f62a304 Mon Sep 17 00:00:00 2001 From: aMannus Date: Fri, 4 Jul 2025 11:49:45 +0200 Subject: [PATCH] Temporarily disable skull token flag setting --- soh/soh/Enhancements/randomizer/hook_handlers.cpp | 7 +++++-- soh/soh/Network/Archipelago/Archipelago.cpp | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 9fbe53fc8..6c48a59c9 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -313,6 +313,7 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) { break; case SPOILER_CHK_RANDOMIZER_INF: Flags_SetRandomizerInf(static_cast(flagID)); + break; case SPOILER_CHK_EVENT_CHK_INF: Flags_SetEventChkInf(flagID); break; @@ -323,11 +324,13 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) { Flags_SetInfTable(flagID); break; case SPOILER_CHK_GOLD_SKULLTULA: - SET_GS_FLAGS((flagID & 0x1F00) >> 8, flagID & 0xFF); + randomizerQueuedChecks.push(rc); + // Below doesn't work, temporarily disabled until a solution is found + // SET_GS_FLAGS((flagID & 0x1F00) >> 8, flagID & 0xFF); break; case SPOILER_CHK_GRAVEDIGGER: // This enum is used nowhere in code, so i'll leave it as nothing for now case SPOILER_CHK_NONE: - // do Nothing + // Do nothing break; } } diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index fad097bfb..4dc3bcf40 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -218,8 +218,9 @@ bool ArchipelagoClient::StartClient() { if (deathLink && data["data"]["source"] != apClient->get_slot()) { if (GameInteractor::IsSaveLoaded()) { gSaveContext.health = 0; - Notification::Emit({ .prefix = data["data"]["source"], - .message = "died. Cause:", + Notification::Emit( + { .prefix = data["data"]["source"] + "died.", + .message = "Cause:", .suffix = data["data"]["cause"] }); std::string deathLinkMessage = "[LOG] Received death link from " + std::string(data["data"]["source"]) + ". Cause: " + std::string(data["data"]["cause"]);