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-10-18 21:04:50 +02:00
parent cbf847c1b9
commit 49c74c75b0
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

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

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

@@ -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) {