diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 8651e74a4..a20935378 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -257,7 +257,7 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) { Rando::Context::GetInstance()->GetOption(RSK_SHUFFLE_TOKENS).Is(RO_TOKENSANITY_OFF)) return; 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) return; } @@ -302,8 +302,8 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) { inSameArea = scene == gPlayState->sceneNum; } - // setting the ocarinina obtained event flag - if(rc == RC_HF_OCARINA_OF_TIME_ITEM) { + // setting the ocarinina obtained event flag + if (rc == RC_HF_OCARINA_OF_TIME_ITEM) { randomizerQueuedChecks.push(rc); return; } @@ -382,7 +382,7 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() { getItemEntry = Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet); } - if(rc == RC_HF_OCARINA_OF_TIME_ITEM && loc->HasObtained()) { + if (rc == RC_HF_OCARINA_OF_TIME_ITEM && loc->HasObtained()) { RandomizerOnExternalCheckHandler(RC_SONG_FROM_OCARINA_OF_TIME); } diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index 73a715a45..2f6560b07 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -62,7 +62,8 @@ bool ArchipelagoClient::StartClient() { apClient->set_socket_error_handler([&](const std::string& msg) { retries++; if (retries >= AP_Client_consts::MAX_RETRIES) { - ArchipelagoConsole_SendMessage("[ERROR] Could not connect to server after several tries.\nAre the entered server address and port correct?"); + ArchipelagoConsole_SendMessage("[ERROR] Could not connect to server after several tries.\nAre the entered " + "server address and port correct?"); CVarSetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 2); // Connection error disconnecting = true; @@ -114,8 +115,8 @@ bool ArchipelagoClient::StartClient() { apClient->set_slot_refused_handler([&](const std::list& msgs) { disconnecting = true; - for(const std::string& msg : msgs) { - ArchipelagoConsole_SendMessage(std::string("[ERROR] "+ msg).c_str()); + for (const std::string& msg : msgs) { + ArchipelagoConsole_SendMessage(std::string("[ERROR] " + msg).c_str()); } });