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

Fix crash on miniHillFort popup window

Browse Source
This commit is contained in:
MichalZr6
2024-11-15 00:58:35 +01:00
parent 7e2cad158a
commit ab1f1d6d99
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/MiscObjects.cpp
View File

@@ -1337,7 +1337,7 @@ std::string HillFort::getPopupText(PlayerColor player) const
{ {
MetaString message = MetaString::createFromRawString("{%s}\r\n\r\n%s"); MetaString message = MetaString::createFromRawString("{%s}\r\n\r\n%s");
message.replaceName(ID); message.replaceName(ID, subID);
message.replaceTextID(getDescriptionToolTip()); message.replaceTextID(getDescriptionToolTip());
return message.toString(); return message.toString();

7
lib/texts/MetaString.cpp
View File

@@ -393,11 +393,16 @@ void MetaString::replaceName(const FactionID & id)
replaceTextID(id.toEntity(VLC)->getNameTextID()); replaceTextID(id.toEntity(VLC)->getNameTextID());
} }
void MetaString::replaceName(const MapObjectID& id) void MetaString::replaceName(const MapObjectID & id)
{ {
replaceTextID(VLC->objtypeh->getObjectName(id, 0)); replaceTextID(VLC->objtypeh->getObjectName(id, 0));
} }
void MetaString::replaceName(const MapObjectID & id, const MapObjectSubID & subId)
{
replaceTextID(VLC->objtypeh->getObjectName(id, subId));
}
void MetaString::replaceName(const PlayerColor & id) void MetaString::replaceName(const PlayerColor & id)
{ {
replaceTextID(TextIdentifier("vcmi.capitalColors", id.getNum()).get()); replaceTextID(TextIdentifier("vcmi.capitalColors", id.getNum()).get());

3
lib/texts/MetaString.h
View File

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