games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Town name switched to id

Browse Source
This commit is contained in:
nordsoft
2023-09-27 23:57:05 +02:00
parent 41da252e67
commit 0c94a4d891
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/mapObjects/CGTownInstance.cpp
View File

@@ -327,7 +327,7 @@ void CGTownInstance::onHeroVisit(const CGHeroInstance * h) const
}
else
{
logGlobal->error("%s visits allied town of %s from different pos?", h->getNameTranslated(), name);
logGlobal->error("%s visits allied town of %s from different pos?", h->getNameTranslated(), nameTextId);
}
}
@@ -337,15 +337,15 @@ void CGTownInstance::onHeroLeave(const CGHeroInstance * h) const
if(visitingHero == h)
{
cb->stopHeroVisitCastle(this, h);
logGlobal->trace("%s correctly left town %s", h->getNameTranslated(), name);
logGlobal->trace("%s correctly left town %s", h->getNameTranslated(), nameTextId);
}
else
logGlobal->warn("Warning, %s tries to leave the town %s but hero is not inside.", h->getNameTranslated(), name);
logGlobal->warn("Warning, %s tries to leave the town %s but hero is not inside.", h->getNameTranslated(), nameTextId);
}
std::string CGTownInstance::getObjectName() const
{
return name + ", " + town->faction->getNameTranslated();
return nameTextId + ", " + town->faction->getNameTranslated();
}
bool CGTownInstance::townEnvisagesBuilding(BuildingSubID::EBuildingSubID subId) const
@@ -767,7 +767,7 @@ void CGTownInstance::updateAppearance()
std::string CGTownInstance::nodeName() const
{
return "Town (" + (town ? town->faction->getNameTranslated() : "unknown") + ") of " + name;
return "Town (" + (town ? town->faction->getNameTranslated() : "unknown") + ") of " + nameTextId;
}
void CGTownInstance::deserializationFix()
@@ -915,12 +915,12 @@ CBonusSystemNode & CGTownInstance::whatShouldBeAttached()
std::string CGTownInstance::getNameTranslated() const
{
return name;
return VLC->generaltexth->translate(nameTextId);
}
void CGTownInstance::setNameTranslated( const std::string & newName )
void CGTownInstance::setNameTextId( const std::string & newName )
{
name = newName;
nameTextId = newName;
}
const CArmedInstance * CGTownInstance::getUpperArmy() const
@@ -980,7 +980,7 @@ TResources CGTownInstance::getBuildingCost(const BuildingID & buildingID) const
return town->buildings.at(buildingID)->resources;
else
{
logGlobal->error("Town %s at %s has no possible building %d!", name, pos.toString(), buildingID.toEnum());
logGlobal->error("Town %s at %s has no possible building %d!", nameTextId, pos.toString(), buildingID.toEnum());
return TResources();
}
@@ -1097,7 +1097,7 @@ void CGTownInstance::serializeJsonOptions(JsonSerializeFormat & handler)
if(!handler.saving)
handler.serializeEnum("tightFormation", formation, NArmyFormation::names); //for old format
CArmedInstance::serializeJsonOptions(handler);
handler.serializeString("name", name);
handler.serializeString("name", nameTextId);
{
auto decodeBuilding = [this](const std::string & identifier) -> si32