diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index c58273adb..b52d6c36b 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp @@ -1137,30 +1137,30 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l } else if (item00->itemEntry.modIndex == MOD_RANDOMIZER) { std::string message; std::string itemName; - + if (!(item00->itemEntry.getItemId == RG_ARCHIPELAGO_ITEM_PROGRESSIVE || item00->itemEntry.getItemId == RG_ARCHIPELAGO_ITEM_USEFUL || item00->itemEntry.getItemId == RG_ARCHIPELAGO_ITEM_JUNK)) { - + switch (gSaveContext.language) { case LANGUAGE_FRA: message = "Vous obtenez: "; itemName = Rando::StaticData::RetrieveItem((RandomizerGet)item00->itemEntry.getItemId) - .GetName() - .french; + .GetName() + .french; break; case LANGUAGE_GER: message = "Du erhältst: "; itemName = Rando::StaticData::RetrieveItem((RandomizerGet)item00->itemEntry.getItemId) - .GetName() - .german; + .GetName() + .german; break; case LANGUAGE_ENG: default: message = "You found "; itemName = Rando::StaticData::RetrieveItem((RandomizerGet)item00->itemEntry.getItemId) - .GetName() - .english; + .GetName() + .english; break; } diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 0fcbb63ec..ec33963cd 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -4701,7 +4701,7 @@ CustomMessage Randomizer::GetMerchantMessage(RandomizerCheck rc, TextIDs textId, shopItemGet == RG_ARCHIPELAGO_ITEM_JUNK) { auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet); std::string apItemName = std::string(gSaveContext.ship.quest.data.archipelago.locations[rc].itemName) + " (" + - std::string(gSaveContext.ship.quest.data.archipelago.locations[rc].playerName) + ")"; + std::string(gSaveContext.ship.quest.data.archipelago.locations[rc].playerName) + ")"; shopItemName = { Text(apItemName) }; } else { auto shopItem = Rando::StaticData::RetrieveItem(shopItemGet); diff --git a/soh/soh/Network/Archipelago/Archipelago.cpp b/soh/soh/Network/Archipelago/Archipelago.cpp index 0393c79f5..6b4282208 100644 --- a/soh/soh/Network/Archipelago/Archipelago.cpp +++ b/soh/soh/Network/Archipelago/Archipelago.cpp @@ -80,7 +80,8 @@ bool ArchipelagoClient::StartClient() { if (CVarGetInteger(CVAR_REMOTE_ARCHIPELAGO("DeathLink"), 0)) { tags.push_back("DeathLink"); } - apClient->ConnectSlot(CVarGetString(CVAR_REMOTE_ARCHIPELAGO("SlotName"), ""), password, 0b0101, tags, {0, 6, 4}); + apClient->ConnectSlot(CVarGetString(CVAR_REMOTE_ARCHIPELAGO("SlotName"), ""), password, 0b0101, tags, + { 0, 6, 4 }); }); apClient->set_slot_connected_handler([&](const nlohmann::json data) {