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

Clang format

Browse Source
This commit is contained in:
aMannus
2025-08-06 23:01:14 +02:00
parent fc80fb5413
commit 58a564077e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

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

@@ -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<std::string>& 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());
}
});