games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix town name

Browse Source
This commit is contained in:
nordsoft
2023-09-28 02:51:44 +02:00
parent 6da605ff83
commit 3c2549d905
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapObjects/CGTownInstance.cpp
View File

@@ -327,7 +327,7 @@ void CGTownInstance::onHeroVisit(const CGHeroInstance * h) const
} }
else else
{ {
logGlobal->error("%s visits allied town of %s from different pos?", h->getNameTranslated(), nameTextId); logGlobal->error("%s visits allied town of %s from different pos?", h->getNameTranslated(), getNameTranslated());
} }
} }
@@ -337,15 +337,15 @@ void CGTownInstance::onHeroLeave(const CGHeroInstance * h) const
if(visitingHero == h) if(visitingHero == h)
{ {
cb->stopHeroVisitCastle(this, h); cb->stopHeroVisitCastle(this, h);
logGlobal->trace("%s correctly left town %s", h->getNameTranslated(), nameTextId); logGlobal->trace("%s correctly left town %s", h->getNameTranslated(), getNameTranslated());
} }
else else
logGlobal->warn("Warning, %s tries to leave the town %s but hero is not inside.", h->getNameTranslated(), nameTextId); logGlobal->warn("Warning, %s tries to leave the town %s but hero is not inside.", h->getNameTranslated(), getNameTranslated());
} }
std::string CGTownInstance::getObjectName() const std::string CGTownInstance::getObjectName() const
{ {
return nameTextId + ", " + town->faction->getNameTranslated(); return getNameTranslated() + ", " + town->faction->getNameTranslated();
} }
bool CGTownInstance::townEnvisagesBuilding(BuildingSubID::EBuildingSubID subId) const bool CGTownInstance::townEnvisagesBuilding(BuildingSubID::EBuildingSubID subId) const
@@ -767,7 +767,7 @@ void CGTownInstance::updateAppearance()
std::string CGTownInstance::nodeName() const std::string CGTownInstance::nodeName() const
{ {
return "Town (" + (town ? town->faction->getNameTranslated() : "unknown") + ") of " + nameTextId; return "Town (" + (town ? town->faction->getNameTranslated() : "unknown") + ") of " + getNameTranslated();
} }
void CGTownInstance::deserializationFix() void CGTownInstance::deserializationFix()
@@ -980,7 +980,7 @@ TResources CGTownInstance::getBuildingCost(const BuildingID & buildingID) const
return town->buildings.at(buildingID)->resources; return town->buildings.at(buildingID)->resources;
else else
{ {
logGlobal->error("Town %s at %s has no possible building %d!", nameTextId, pos.toString(), buildingID.toEnum()); logGlobal->error("Town %s at %s has no possible building %d!", getNameTranslated(), pos.toString(), buildingID.toEnum());
return TResources(); return TResources();
} }