From 427b5aa25cefa4dcb04132381e4570d6640dc8e2 Mon Sep 17 00:00:00 2001 From: aMannus Date: Wed, 2 Jul 2025 15:40:16 +0200 Subject: [PATCH] Fix archi connection cvar & stop normal rando gen with archi --- soh/soh/Enhancements/bootcommands.c | 2 ++ soh/soh/Enhancements/randomizer/context.cpp | 3 --- soh/soh/Network/Archipelago/Archipelago.cpp | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c index dde827ec5..033ce3858 100644 --- a/soh/soh/Enhancements/bootcommands.c +++ b/soh/soh/Enhancements/bootcommands.c @@ -19,6 +19,8 @@ void BootCommands_Init() { CVarClear(CVAR_GENERAL("OnFileSelectNameEntry")); // Clear when soh is killed on the file name entry page CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQMode")); CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQModeScene")); + + CVarClear(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus")); // Clear on boot to reset connection status #if defined(__SWITCH__) || defined(__WIIU__) CVarRegisterInteger(CVAR_IMGUI_CONTROLLER_NAV, 1); // always enable controller nav on switch/wii u #endif diff --git a/soh/soh/Enhancements/randomizer/context.cpp b/soh/soh/Enhancements/randomizer/context.cpp index 069d0394b..ea249ca50 100644 --- a/soh/soh/Enhancements/randomizer/context.cpp +++ b/soh/soh/Enhancements/randomizer/context.cpp @@ -427,9 +427,6 @@ void Context::ParseArchipelago() { mEntranceShuffler->UnshuffleAllEntrances(); mDungeons->ResetAllDungeons(); mTrials->RemoveAllTrials(); - - mSpoilerLoaded = true; - mSeedGenerated = false; } void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) { diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index 5c8e80064..0edfbe7dd 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -518,8 +518,6 @@ void RegisterArchipelago() { // make sure the client is constructed ArchipelagoClient::GetInstance(); - CVarSetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0); - COND_HOOK(GameInteractor::OnGameFrameUpdate, true, []() { ArchipelagoClient::GetInstance().Poll(); }); COND_HOOK(GameInteractor::PostLoadGame, true, [](int32_t file_id) { ArchipelagoClient::GetInstance().GameLoaded(); });