From 00a70eae8746c435a67e64d491a721b0218a8abc Mon Sep 17 00:00:00 2001 From: aMannus Date: Thu, 31 Jul 2025 10:44:47 +0200 Subject: [PATCH] clang format --- .../Enhancements/FileSelectEnhancements.cpp | 4 +- soh/soh/Network/Archipelago/Archipelago.cpp | 32 ++++---- .../Archipelago/ArchipelagoConsoleWindow.cpp | 7 +- .../Network/Archipelago/ArchipelagoTypes.h | 46 +++++------ soh/soh/SaveManager.cpp | 3 +- soh/src/code/z_parameter.c | 57 +++++++------- .../ovl_file_choose/z_file_choose.c | 76 ++++++++++--------- 7 files changed, 114 insertions(+), 111 deletions(-) diff --git a/soh/soh/Enhancements/FileSelectEnhancements.cpp b/soh/soh/Enhancements/FileSelectEnhancements.cpp index b75e7d81c..82bb784d8 100644 --- a/soh/soh/Enhancements/FileSelectEnhancements.cpp +++ b/soh/soh/Enhancements/FileSelectEnhancements.cpp @@ -111,13 +111,13 @@ std::array ArchipelagoSettingsMenuText[ASM_MAX]{ "Todo", "Todo", }, - //ASM_CHAR_START_TO_CONNECT + // ASM_CHAR_START_TO_CONNECT { "Start to automatically connect to this slot", "Todo", "Todo", }, - //ASM_CHAR_SELECT_CONNECTED_TO_OTHER_SLOT + // ASM_CHAR_SELECT_CONNECTED_TO_OTHER_SLOT { "Connected to a different slot", "Todo", diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index cbf80fb3d..4c87c7d0c 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -53,9 +53,7 @@ bool ArchipelagoClient::StartClient() { uri = CVarGetString(CVAR_REMOTE_ARCHIPELAGO("ServerAddress"), "localhost:38281"); password = CVarGetString(CVAR_REMOTE_ARCHIPELAGO("Password"), ""); - apClient = std::unique_ptr( - new APClient(uuid, AP_Client_consts::AP_GAME_NAME, - uri, "cacert.pem")); + apClient = std::unique_ptr(new APClient(uuid, AP_Client_consts::AP_GAME_NAME, uri, "cacert.pem")); CVarSetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 1); // Connecting @@ -67,7 +65,7 @@ bool ArchipelagoClient::StartClient() { CVarSetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 2); // Connection error disconnecting = true; - if(GameInteractor::IsSaveLoaded) { + if (GameInteractor::IsSaveLoaded) { SohGui::ShowArchipelagoSettingsMenu(); } return; @@ -80,8 +78,7 @@ bool ArchipelagoClient::StartClient() { if (CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("DeathLink"), 0)) { tags.push_back("DeathLink"); } - apClient->ConnectSlot(CVarGetString(CVAR_REMOTE_ARCHIPELAGO("SlotName"), ""), - password, 0b001, tags); + apClient->ConnectSlot(CVarGetString(CVAR_REMOTE_ARCHIPELAGO("SlotName"), ""), password, 0b001, tags); }); apClient->set_slot_connected_handler([&](const nlohmann::json data) { @@ -234,19 +231,20 @@ bool ArchipelagoClient::StartClient() { }); apClient->set_bounced_handler([&](const nlohmann::json data) { - if(data.contains("tags")) { + if (data.contains("tags")) { std::list tags = data["tags"]; bool deathLink = (std::find(tags.begin(), tags.end(), "DeathLink") != tags.end()); - + if (deathLink && data["data"]["source"] != apClient->get_slot()) { if (GameInteractor::IsSaveLoaded()) { gSaveContext.health = 0; std::string prefixText = std::string(data["data"]["source"]) + " died."; Notification::Emit({ .prefix = prefixText, .message = "Cause:", .suffix = data["data"]["cause"] }); - std::string deathLinkMessage = "[LOG] Received death link from " + std::string(data["data"]["source"]) + + std::string deathLinkMessage = "[LOG] Received death link from " + + std::string(data["data"]["source"]) + ". Cause: " + std::string(data["data"]["cause"]); ArchipelagoConsole_SendMessage(deathLinkMessage.c_str()); - + isDeathLinkedDeath = true; } } @@ -262,7 +260,7 @@ bool ArchipelagoClient::StopClient() { } void ArchipelagoClient::GameLoaded() { - + // Load textures for the archipelago items that're shown in the notifications static bool sArchipelagoTexturesLoaded = false; if (!sArchipelagoTexturesLoaded) { @@ -277,7 +275,7 @@ void ArchipelagoClient::GameLoaded() { } if (apClient == nullptr) { - if(IS_ARCHIPELAGO) { + if (IS_ARCHIPELAGO) { CVarSetString(CVAR_REMOTE_ARCHIPELAGO("ServerAddress"), gSaveContext.ship.quest.data.archipelago.archiUri); CVarSetString(CVAR_REMOTE_ARCHIPELAGO("SlotName"), gSaveContext.ship.quest.data.archipelago.slotName); CVarSetString(CVAR_REMOTE_ARCHIPELAGO("Password"), gSaveContext.ship.quest.data.archipelago.roomPass); @@ -423,7 +421,7 @@ void ArchipelagoClient::QueueItem(const ApItem item) { } void ArchipelagoClient::SendGameWon() { - if(apClient == nullptr) { + if (apClient == nullptr) { return; } @@ -473,10 +471,10 @@ void ArchipelagoClient::Poll() { apClient->poll(); } -void ArchipelagoClient::ResetQueue(){ +void ArchipelagoClient::ResetQueue() { itemQueued = false; std::queue empty; - std::swap( receiveQueue, empty ); + std::swap(receiveQueue, empty); } bool ArchipelagoClient::slotMatch(const std::string& slotName, const std::string& roomHash) { @@ -484,7 +482,7 @@ bool ArchipelagoClient::slotMatch(const std::string& slotName, const std::string return false; } - if(disconnecting) { + if (disconnecting) { return false; } @@ -624,7 +622,7 @@ void LoadArchipelagoData() { ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.slotName)); SaveManager::Instance->LoadCharArray("archiUri", gSaveContext.ship.quest.data.archipelago.archiUri, ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.archiUri)); - SaveManager::Instance->LoadCharArray("roomPass", gSaveContext.ship.quest.data.archipelago.roomPass, + SaveManager::Instance->LoadCharArray("roomPass", gSaveContext.ship.quest.data.archipelago.roomPass, ARRAY_COUNT(gSaveContext.ship.quest.data.archipelago.roomPass)); SaveManager::Instance->LoadArray( diff --git a/soh/soh/Network/Archipelago/ArchipelagoConsoleWindow.cpp b/soh/soh/Network/Archipelago/ArchipelagoConsoleWindow.cpp index f5b687169..48275e34f 100644 --- a/soh/soh/Network/Archipelago/ArchipelagoConsoleWindow.cpp +++ b/soh/soh/Network/Archipelago/ArchipelagoConsoleWindow.cpp @@ -100,9 +100,9 @@ void ArchipelagoConsoleWindow::DrawElement() { ImGui::PopStyleVar(4); }; -ImVec4 ArchipelagoConsoleWindow::getColorVal(const AP_Text::TextColor color) { - using apt = AP_Text::TextColor; - switch(color) { +ImVec4 ArchipelagoConsoleWindow::getColorVal(const AP_Text::TextColor color) { + using apt = AP_Text::TextColor; + switch (color) { case apt::COLOR_ERROR: return ImVec4(1.0f, 0.4f, 0.4f, 1.0f); case apt::COLOR_LOG: @@ -137,4 +137,3 @@ ImVec4 ArchipelagoConsoleWindow::getColorVal(const AP_Text::TextColor color) { return ImVec4(0.93f, 0.93f, 0.93f, 1.00f); }; } - \ No newline at end of file diff --git a/soh/soh/Network/Archipelago/ArchipelagoTypes.h b/soh/soh/Network/Archipelago/ArchipelagoTypes.h index e2da978b1..feaf8999a 100644 --- a/soh/soh/Network/Archipelago/ArchipelagoTypes.h +++ b/soh/soh/Network/Archipelago/ArchipelagoTypes.h @@ -2,29 +2,29 @@ #ifdef __cplusplus namespace AP_Text { - enum class TextColor : char { - COLOR_DEFAULT = 0, - COLOR_ERROR, - COLOR_LOG, - COLOR_BLACK, - COLOR_RED, - COLOR_GREEN, - COLOR_YELLOW, - COLOR_BLUE, - COLOR_CYAN, - COLOR_MAGENTA, - COLOR_SLATEBLUE, - COLOR_PLUM, - COLOR_SALMON, - COLOR_WHITE, - COLOR_ORANGE, - COLOR_GRAY - }; +enum class TextColor : char { + COLOR_DEFAULT = 0, + COLOR_ERROR, + COLOR_LOG, + COLOR_BLACK, + COLOR_RED, + COLOR_GREEN, + COLOR_YELLOW, + COLOR_BLUE, + COLOR_CYAN, + COLOR_MAGENTA, + COLOR_SLATEBLUE, + COLOR_PLUM, + COLOR_SALMON, + COLOR_WHITE, + COLOR_ORANGE, + COLOR_GRAY +}; - struct ColoredTextNode { - std::string text; - AP_Text::TextColor color; - }; -} +struct ColoredTextNode { + std::string text; + AP_Text::TextColor color; +}; +} // namespace AP_Text #endif \ No newline at end of file diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp index 4ec72f0d5..968ce531c 100644 --- a/soh/soh/SaveManager.cpp +++ b/soh/soh/SaveManager.cpp @@ -517,7 +517,8 @@ void SaveManager::InitMeta(int fileNum) { ARRAY_COUNT(fileMetaInfo[fileNum].archiUri)); SohUtils::CopyStringToCharArray(fileMetaInfo[fileNum].slotName, gSaveContext.ship.quest.data.archipelago.slotName, ARRAY_COUNT(fileMetaInfo[fileNum].slotName)); - SohUtils::CopyStringToCharArray(fileMetaInfo[fileNum].archiRoomSeed, gSaveContext.ship.quest.data.archipelago.roomHash, + SohUtils::CopyStringToCharArray(fileMetaInfo[fileNum].archiRoomSeed, + gSaveContext.ship.quest.data.archipelago.roomHash, ARRAY_COUNT(fileMetaInfo[fileNum].archiRoomSeed)); } diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 60447de27..1384d8185 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -3434,19 +3434,19 @@ void Interface_DrawArchipelagoStatusString(PlayState* play) { int32_t sTexScale = 1024.0f / (scale / 100.0f); gDPLoadTextureBlock(play->state.gfxCtx->overlay.p++, gArchipelagoItemTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 64, 64, 0, - G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, G_TX_NOLOD, G_TX_NOLOD); + G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, G_TX_NOLOD, G_TX_NOLOD); gSPWideTextureRectangle(play->state.gfxCtx->overlay.p++, posX << 2, posY << 2, (posX + sTexSize) << 2, - (posY + sTexSize) << 2, G_TX_RENDERTILE, 0, 0, sTexScale, sTexScale); + (posY + sTexSize) << 2, G_TX_RENDERTILE, 0, 0, sTexScale, sTexScale); - //SPWideTextureRectangle(OVERLAY_DISP++, ((rMagicBarX + gSaveContext.magicCapacity) + 8) << 2, magicBarY << 2, - // ((rMagicBarX + gSaveContext.magicCapacity) + 16) << 2, (magicBarY + 16) << 2, - // G_TX_RENDERTILE, 256, 0, 1 << 10, 1 << 10); + // SPWideTextureRectangle(OVERLAY_DISP++, ((rMagicBarX + gSaveContext.magicCapacity) + 8) << 2, magicBarY << 2, + // ((rMagicBarX + gSaveContext.magicCapacity) + 16) << 2, (magicBarY + 16) << 2, + // G_TX_RENDERTILE, 256, 0, 1 << 10, 1 << 10); posX += 13; uint8_t language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language; char* statusText = SohFileSelect_GetArchipelagoSettingText(ASM_NOT_CONNECTED, language); - switch(CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0)) { + switch (CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0)) { case 0: // Not Connected statusText = SohFileSelect_GetArchipelagoSettingText(ASM_NOT_CONNECTED, language); break; @@ -3460,7 +3460,6 @@ void Interface_DrawArchipelagoStatusString(PlayState* play) { break; } - Interface_DrawTextLineOverlay(play->state.gfxCtx, statusText, posX, posY, 255, 255, 255, 255, 0.8f, true); } @@ -5437,7 +5436,7 @@ void Interface_Draw(PlayState* play) { Interface_DrawLineupTick(play); } - if(IS_ARCHIPELAGO) { + if (IS_ARCHIPELAGO) { Interface_DrawArchipelagoStatusString(play); } @@ -6981,8 +6980,8 @@ void Interface_DrawTextCharacter(GraphicsContext* gfx, int16_t x, int16_t y, voi } void Interface_DrawTextCharacter_overlay(GraphicsContext* gfx, int16_t x, int16_t y, void* texture, uint16_t colorR, - uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale, - uint8_t textShadow) { + uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale, + uint8_t textShadow) { int32_t scale = R_TEXT_CHAR_SCALE * textScale; int32_t sCharTexSize = (scale / 100.0f) * 16.0f; @@ -6993,16 +6992,16 @@ void Interface_DrawTextCharacter_overlay(GraphicsContext* gfx, int16_t x, int16_ gDPPipeSync(OVERLAY_DISP++); gDPLoadTextureBlock_4b(OVERLAY_DISP++, texture, G_IM_FMT_I, FONT_CHAR_TEX_WIDTH, FONT_CHAR_TEX_HEIGHT, 0, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, - G_TX_NOLOD); + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, + G_TX_NOLOD); if (textShadow) { // Draw drop shadow gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 0, 0, 0, colorA); - gSPWideTextureRectangle(OVERLAY_DISP++, (x + R_TEXT_DROP_SHADOW_OFFSET) << 2, (y + R_TEXT_DROP_SHADOW_OFFSET) << 2, - (x + R_TEXT_DROP_SHADOW_OFFSET + sCharTexSize) << 2, - (y + R_TEXT_DROP_SHADOW_OFFSET + sCharTexSize) << 2, G_TX_RENDERTILE, 0, 0, sCharTexScale, - sCharTexScale); + gSPWideTextureRectangle( + OVERLAY_DISP++, (x + R_TEXT_DROP_SHADOW_OFFSET) << 2, (y + R_TEXT_DROP_SHADOW_OFFSET) << 2, + (x + R_TEXT_DROP_SHADOW_OFFSET + sCharTexSize) << 2, (y + R_TEXT_DROP_SHADOW_OFFSET + sCharTexSize) << 2, + G_TX_RENDERTILE, 0, 0, sCharTexScale, sCharTexScale); } gDPPipeSync(OVERLAY_DISP++); @@ -7010,7 +7009,7 @@ void Interface_DrawTextCharacter_overlay(GraphicsContext* gfx, int16_t x, int16_ // Draw normal text gDPSetPrimColor(OVERLAY_DISP++, 0, 0, colorR, colorG, colorB, colorA); gSPWideTextureRectangle(OVERLAY_DISP++, x << 2, y << 2, (x + sCharTexSize) << 2, (y + sCharTexSize) << 2, - G_TX_RENDERTILE, 0, 0, sCharTexScale, sCharTexScale); + G_TX_RENDERTILE, 0, 0, sCharTexScale, sCharTexScale); CLOSE_DISPS(gfx); } @@ -7047,8 +7046,8 @@ uint16_t Interface_DrawTextLine(GraphicsContext* gfx, char text[], int16_t x, in } uint16_t Interface_DrawTextLineOverlay(GraphicsContext* gfx, char text[], int16_t x, int16_t y, uint16_t colorR, - uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale, - uint8_t textShadow) { + uint16_t colorG, uint16_t colorB, uint16_t colorA, float textScale, + uint8_t textShadow) { uint16_t textureIndex; uint16_t kerningOffset = 0; @@ -7061,16 +7060,16 @@ uint16_t Interface_DrawTextLineOverlay(GraphicsContext* gfx, char text[], int16_ if (processedText[i] == '\n') { lineOffset += 15 * textScale; kerningOffset = 0; - } else { - textureIndex = processedText[i] - 32; - - if (textureIndex != 0) { - texture = Ship_GetCharFontTexture(processedText[i]); - Interface_DrawTextCharacter_overlay(gfx, (int16_t)(x + kerningOffset), (int16_t)(y + lineOffset), texture, colorR, colorG, colorB, - colorA, textScale, textShadow); - } - kerningOffset += - (uint16_t)(Ship_GetCharFontWidth(processedText[i]) * (R_TEXT_CHAR_SCALE / 100.0f) * textScale); + } else { + textureIndex = processedText[i] - 32; + + if (textureIndex != 0) { + texture = Ship_GetCharFontTexture(processedText[i]); + Interface_DrawTextCharacter_overlay(gfx, (int16_t)(x + kerningOffset), (int16_t)(y + lineOffset), + texture, colorR, colorG, colorB, colorA, textScale, textShadow); + } + kerningOffset += + (uint16_t)(Ship_GetCharFontWidth(processedText[i]) * (R_TEXT_CHAR_SCALE / 100.0f) * textScale); } } diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 6ace3962e..c7a0e23de 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -2479,7 +2479,7 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { // draw death count if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) == 0 || this->menuMode != FS_MENU_MODE_SELECT || - Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave) { + Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave) { for (i = 0, vtxOffset = 0; i < 3; i++, vtxOffset += 4) { FileChoose_DrawCharacter(this->state.gfxCtx, sp54->fontBuf + deathCountSplit[i] * FONT_CHAR_TEX_SIZE, vtxOffset); @@ -2506,7 +2506,7 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { i = Save_GetSaveMetaInfo(fileIndex)->healthCapacity / 0x10; if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) == 0 || this->menuMode != FS_MENU_MODE_SELECT || - Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave) { + Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave) { // draw hearts for (vtxOffset = 0, j = 0; j < i; j++, vtxOffset += 4) { gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[D_8081284C[fileIndex] + vtxOffset] + 0x30, 4, 0); @@ -2523,8 +2523,8 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { textAlpha = 255; } - if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) != 0 && this->menuMode == FS_MENU_MODE_SELECT && - Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave == 0) { + if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) != 0 && this->menuMode == FS_MENU_MODE_SELECT && + Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave == 0) { DrawMoreInfo(this, fileIndex, textAlpha); } else { // draw quest items @@ -2549,51 +2549,55 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { } } - if(Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave) { + if (Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave) { uint8_t language = (gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language; - + // Connection status text - int statusPos = 61 + Interface_DrawTextLine(this->state.gfxCtx, SohFileSelect_GetArchipelagoSettingText(ASM_STATUS, language), - 58, 133, 200, 200, 200, textAlpha, 0.8f, true); + int statusPos = 61 + Interface_DrawTextLine(this->state.gfxCtx, + SohFileSelect_GetArchipelagoSettingText(ASM_STATUS, language), + 58, 133, 200, 200, 200, textAlpha, 0.8f, true); - const bool connectedToThisSlot = checkArchipelagoSlotInfo(Save_GetSaveMetaInfo(this->selectedFileIndex)->slotName, - Save_GetSaveMetaInfo(this->selectedFileIndex)->archiRoomSeed); + const bool connectedToThisSlot = + checkArchipelagoSlotInfo(Save_GetSaveMetaInfo(this->selectedFileIndex)->slotName, + Save_GetSaveMetaInfo(this->selectedFileIndex)->archiRoomSeed); - switch(CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0)) { + switch (CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0)) { case 0: // Not Connected Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_NOT_CONNECTED, language), + SohFileSelect_GetArchipelagoSettingText(ASM_NOT_CONNECTED, language), statusPos, 133, 255, 120, 120, textAlpha, 0.8f, true); break; case 1: // Connecting case 2: // Connection error, retrying case 3: // Connected Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTING, language), - statusPos, 133, 185, 185, 185, textAlpha, 0.8f, true); + SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTING, language), statusPos, + 133, 185, 185, 185, textAlpha, 0.8f, true); break; case 4: // Connected + Locations Scouted - if(connectedToThisSlot) { + if (connectedToThisSlot) { Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTED, language), - statusPos, 133, 120, 255, 120, textAlpha, 0.8f, true); + SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTED, language), + statusPos, 133, 120, 255, 120, textAlpha, 0.8f, true); } else { - Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_CHAR_SELECT_CONNECTED_TO_OTHER_SLOT, language), + Interface_DrawTextLine( + this->state.gfxCtx, + SohFileSelect_GetArchipelagoSettingText(ASM_CHAR_SELECT_CONNECTED_TO_OTHER_SLOT, language), statusPos, 133, 255, 255, 120, textAlpha, 0.8f, true); } - + break; } - if(!connectedToThisSlot) { - Interface_DrawTextLine(this->state.gfxCtx, SohFileSelect_GetArchipelagoSettingText(ASM_CHAR_START_TO_CONNECT, language), - 58, 144, 200, 200, 200, textAlpha, 0.8f, true); + if (!connectedToThisSlot) { + Interface_DrawTextLine(this->state.gfxCtx, + SohFileSelect_GetArchipelagoSettingText(ASM_CHAR_START_TO_CONNECT, language), 58, + 144, 200, 200, 200, textAlpha, 0.8f, true); } - //Interface_DrawTextLine(this->state.gfxCtx, - // SohFileSelect_GetArchipelagoSettingText(ASM_CHAR_SELECT_CHANGE_CONNECTION_INFO, language), 95, 220, - // 100, 250, 255, textAlpha, 1.0f, true); + // Interface_DrawTextLine(this->state.gfxCtx, + // SohFileSelect_GetArchipelagoSettingText(ASM_CHAR_SELECT_CHANGE_CONNECTION_INFO, language), 95, 220, + // 100, 250, 255, textAlpha, 1.0f, true); } } @@ -2994,26 +2998,27 @@ void FileChoose_DrawWindowContents(GameState* thisx) { 155, 185, 185, 185, textAlpha, 0.8f, true); // Connection status text - int statusPos = 75 + Interface_DrawTextLine(this->state.gfxCtx, SohFileSelect_GetArchipelagoSettingText(ASM_STATUS, language), 70, - 175, 255, 255, 255, textAlpha, 0.8f, true); + int statusPos = 75 + Interface_DrawTextLine(this->state.gfxCtx, + SohFileSelect_GetArchipelagoSettingText(ASM_STATUS, language), 70, + 175, 255, 255, 255, textAlpha, 0.8f, true); switch (CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("ConnectionStatus"), 0)) { case 0: // Not Connected Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_NOT_CONNECTED, language), statusPos, 175, - 255, 120, 120, textAlpha, 0.8f, true); + SohFileSelect_GetArchipelagoSettingText(ASM_NOT_CONNECTED, language), statusPos, + 175, 255, 120, 120, textAlpha, 0.8f, true); break; case 1: // Connecting case 2: // Connection error, retrying case 3: // Connected Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTING, language), statusPos, 175, 185, - 185, 185, textAlpha, 0.8f, true); + SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTING, language), statusPos, + 175, 185, 185, 185, textAlpha, 0.8f, true); break; case 4: // Connected + Locations Scouted Interface_DrawTextLine(this->state.gfxCtx, - SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTED, language), statusPos, 175, 120, - 255, 120, textAlpha, 0.8f, true); + SohFileSelect_GetArchipelagoSettingText(ASM_CONNECTED, language), statusPos, 175, + 120, 255, 120, textAlpha, 0.8f, true); break; } @@ -3055,7 +3060,8 @@ void FileChoose_DrawWindowContents(GameState* thisx) { // Draw the small file name box instead when more meta info is enabled if (CVarGetInteger(CVAR_ENHANCEMENT("FileSelectMoreInfo"), 0) != 0 && - this->menuMode == FS_MENU_MODE_SELECT && Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave == 0) { + this->menuMode == FS_MENU_MODE_SELECT && + Save_GetSaveMetaInfo(this->selectedFileIndex)->archiSave == 0) { // Location of file 1 small name box vertices gSPVertex(POLY_OPA_DISP++, &this->windowContentVtx[68], 4, 0);