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

Fix archi connection cvar & stop normal rando gen with archi

Browse Source
This commit is contained in:
aMannus
2025-07-02 15:40:16 +02:00
parent c06f7bda75
commit 427b5aa25c
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/bootcommands.c
View File

@@ -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("OnFileSelectNameEntry")); // Clear when soh is killed on the file name entry page
CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQMode")); CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQMode"));
CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQModeScene")); CVarClear(CVAR_GENERAL("BetterDebugWarpScreenMQModeScene"));
CVarClear(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus")); // Clear on boot to reset connection status
#if defined(__SWITCH__) || defined(__WIIU__) #if defined(__SWITCH__) || defined(__WIIU__)
CVarRegisterInteger(CVAR_IMGUI_CONTROLLER_NAV, 1); // always enable controller nav on switch/wii u CVarRegisterInteger(CVAR_IMGUI_CONTROLLER_NAV, 1); // always enable controller nav on switch/wii u
#endif #endif

3
soh/soh/Enhancements/randomizer/context.cpp
View File

@@ -427,9 +427,6 @@ void Context::ParseArchipelago() {
mEntranceShuffler->UnshuffleAllEntrances(); mEntranceShuffler->UnshuffleAllEntrances();
mDungeons->ResetAllDungeons(); mDungeons->ResetAllDungeons();
mTrials->RemoveAllTrials(); mTrials->RemoveAllTrials();
mSpoilerLoaded = true;
mSeedGenerated = false;
} }
void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) { void Context::ParseHashIconIndexesJson(nlohmann::json spoilerFileJson) {

2
soh/soh/Network/Archipelago/Archipelago.cpp
View File

@@ -518,8 +518,6 @@ void RegisterArchipelago() {
// make sure the client is constructed // make sure the client is constructed
ArchipelagoClient::GetInstance(); ArchipelagoClient::GetInstance();
CVarSetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0);
COND_HOOK(GameInteractor::OnGameFrameUpdate, true, []() { ArchipelagoClient::GetInstance().Poll(); }); COND_HOOK(GameInteractor::OnGameFrameUpdate, true, []() { ArchipelagoClient::GetInstance().Poll(); });
COND_HOOK(GameInteractor::PostLoadGame, true, COND_HOOK(GameInteractor::PostLoadGame, true,
[](int32_t file_id) { ArchipelagoClient::GetInstance().GameLoaded(); }); [](int32_t file_id) { ArchipelagoClient::GetInstance().GameLoaded(); });