games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

Remove MetaString method that can't be used with modded objects

Browse Source
This commit is contained in:
Ivan Savenko 2024-12-24 15:04:01 +00:00
parent ec25eb557b
commit 101fd694b9
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGDwelling.cpp
View File

@ -217,7 +217,7 @@ void CGDwelling::onHeroVisit( const CGHeroInstance * h ) const
iw.type = EInfoWindowMode::AUTO;
iw.player = h->tempOwner;
iw.text.appendLocalString(EMetaText::ADVOB_TXT, 44); //{%s} \n\n The camp is deserted. Perhaps you should try next week.
iw.text.replaceName(ID);
iw.text.replaceName(ID, subID);
cb->sendAndApply(iw);
return;
}
@ -260,7 +260,7 @@ void CGDwelling::onHeroVisit( const CGHeroInstance * h ) const
else if(ID == Obj::REFUGEE_CAMP)
{
bd.text.appendLocalString(EMetaText::ADVOB_TXT, 35); //{%s} Would you like to recruit %s?
bd.text.replaceName(ID);
bd.text.replaceName(ID, subID);
for(const auto & elem : creatures)
bd.text.replaceNamePlural(elem.second[0]);
}

2
lib/mapObjects/CGMarket.cpp
View File

@ -45,7 +45,7 @@ std::string CGMarket::getPopupText(PlayerColor player) const
return getHoverText(player);
MetaString message = MetaString::createFromRawString("{%s}\r\n\r\n%s");
message.replaceName(ID);
message.replaceName(ID, subID);
message.replaceTextID(TextIdentifier(getObjectHandler()->getBaseTextID(), "description").get());
return message.toString();
}

5
lib/texts/MetaString.cpp
View File

@ -393,11 +393,6 @@ void MetaString::replaceName(const FactionID & id)
replaceTextID(id.toEntity(VLC)->getNameTextID());
}
void MetaString::replaceName(const MapObjectID & id)
{
replaceTextID(VLC->objtypeh->getObjectName(id, 0));
}
void MetaString::replaceName(const MapObjectID & id, const MapObjectSubID & subId)
{
replaceTextID(VLC->objtypeh->getObjectName(id, subId));

1
lib/texts/MetaString.h
View File

@ -99,7 +99,6 @@ public:
void replaceName(const ArtifactID & id);
void replaceName(const FactionID& id);
void replaceName(const MapObjectID & id);
void replaceName(const MapObjectID & id, const MapObjectSubID & subId);
void replaceName(const PlayerColor& id);
void replaceName(const SecondarySkill& id);