fix blank names in spoiler (#5329)
* fix blank names in spoiler * replace a couple more `.english`/`.french` with `.GetEnglish()`/`.GetFrench()`
This commit is contained in:
@@ -267,10 +267,10 @@ static void WriteAllLocations() {
|
|||||||
switch (gSaveContext.language) {
|
switch (gSaveContext.language) {
|
||||||
case 0:
|
case 0:
|
||||||
default:
|
default:
|
||||||
placedItemName = location->GetPlacedItemName().english;
|
placedItemName = location->GetPlacedItemName().GetEnglish();
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
placedItemName = location->GetPlacedItemName().french;
|
placedItemName = location->GetPlacedItemName().GetFrench();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,18 +303,18 @@ static void WriteAllLocations() {
|
|||||||
["model"] = Rando::StaticData::RetrieveItem(
|
["model"] = Rando::StaticData::RetrieveItem(
|
||||||
ctx->overrides[location->GetRandomizerCheck()].LooksLike())
|
ctx->overrides[location->GetRandomizerCheck()].LooksLike())
|
||||||
.GetName()
|
.GetName()
|
||||||
.english;
|
.GetEnglish();
|
||||||
jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
|
jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
|
||||||
["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().english;
|
["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().GetEnglish();
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
|
jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
|
||||||
["model"] = Rando::StaticData::RetrieveItem(
|
["model"] = Rando::StaticData::RetrieveItem(
|
||||||
ctx->overrides[location->GetRandomizerCheck()].LooksLike())
|
ctx->overrides[location->GetRandomizerCheck()].LooksLike())
|
||||||
.GetName()
|
.GetName()
|
||||||
.french;
|
.GetFrench();
|
||||||
jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
|
jsonData["locations"][Rando::StaticData::GetLocation(location->GetRandomizerCheck())->GetName()]
|
||||||
["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().french;
|
["trickName"] = ctx->overrides[location->GetRandomizerCheck()].GetTrickName().GetFrench();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user