games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +02:00
Code Issues Releases Activity

Use toEntity/toXXX methods in Identifier instead VLC objects access

Browse Source
This commit is contained in:
Ivan Savenko
2023-11-02 18:45:46 +02:00
parent 8d5fa41a19
commit 184f5a72cc
29 changed files with 101 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/MetaString.cpp
View File

@ -114,35 +114,35 @@ std::string MetaString::getLocalString(const std::pair<EMetaText, ui32> & txt) c
{
case EMetaText::ART_NAMES:
{
const auto * art = ArtifactID(ser).toArtifact(VLC->artifacts());
const auto * art = ArtifactID(ser).toEntity(VLC->artifacts());
if(art)
return art->getNameTranslated();
return "#!#";
}
case EMetaText::ART_DESCR:
{
const auto * art = ArtifactID(ser).toArtifact(VLC->artifacts());
const auto * art = ArtifactID(ser).toEntity(VLC->artifacts());
if(art)
return art->getDescriptionTranslated();
return "#!#";
}
case EMetaText::ART_EVNTS:
{
const auto * art = ArtifactID(ser).toArtifact(VLC->artifacts());
const auto * art = ArtifactID(ser).toEntity(VLC->artifacts());
if(art)
return art->getEventTranslated();
return "#!#";
}
case EMetaText::CRE_PL_NAMES:
{
const auto * cre = CreatureID(ser).toCreature(VLC->creatures());
const auto * cre = CreatureID(ser).toEntity(VLC->creatures());
if(cre)
return cre->getNamePluralTranslated();
return "#!#";
}
case EMetaText::CRE_SING_NAMES:
{
const auto * cre = CreatureID(ser).toCreature(VLC->creatures());
const auto * cre = CreatureID(ser).toEntity(VLC->creatures());
if(cre)
return cre->getNameSingularTranslated();
return "#!#";
@ -157,7 +157,7 @@ std::string MetaString::getLocalString(const std::pair<EMetaText, ui32> & txt) c
}
case EMetaText::SPELL_NAME:
{
const auto * spell = SpellID(ser).toSpell(VLC->spells());
const auto * spell = SpellID(ser).toEntity(VLC->spells());
if(spell)
return spell->getNameTranslated();
return "#!#";