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

MetaString refactor to eliminate integer usage for identifiers

Browse Source 
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
This commit is contained in:
Ivan Savenko
2023-11-02 22:01:49 +02:00
parent f4feaea177
commit 86a3806bec
22 changed files with 185 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/rewardable/Info.cpp
View File

@@ -249,23 +249,23 @@ void Rewardable::Info::replaceTextPlaceholders(MetaString & target, const Variab
for (const auto & variable : variables.values )
{
if( boost::algorithm::starts_with(variable.first, "spell"))
target.replaceLocalString(EMetaText::SPELL_NAME, variable.second);
target.replaceName(SpellID(variable.second));
if( boost::algorithm::starts_with(variable.first, "secondarySkill"))
target.replaceLocalString(EMetaText::SEC_SKILL_NAME, variable.second);
target.replaceName(SecondarySkill(variable.second));
}
}
void Rewardable::Info::replaceTextPlaceholders(MetaString & target, const Variables & variables, const VisitInfo & info) const
{
for (const auto & artifact : info.reward.artifacts )
target.replaceLocalString(EMetaText::ART_NAMES, artifact.getNum());
target.replaceName(artifact);
for (const auto & artifact : info.reward.spells )
target.replaceLocalString(EMetaText::SPELL_NAME, artifact.getNum());
for (const auto & spell : info.reward.spells )
target.replaceName(spell);
for (const auto & secondary : info.reward.secondary )
target.replaceLocalString(EMetaText::SEC_SKILL_NAME, secondary.first.getNum());
target.replaceName(secondary.first);
replaceTextPlaceholders(target, variables);
}