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

vcmi: use enum class for EComponentType

Browse Source 
There is really no reason not to use it
This commit is contained in:
Konstantin
2023-03-10 15:54:12 +03:00
parent 2bd74e5c67
commit bc228a938a
15 changed files with 148 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapObjects/CBank.cpp
View File

@@ -190,7 +190,7 @@ void CBank::doVisit(const CGHeroInstance * hero) const
break;
}
cb->giveHeroBonus(&gbonus);
iw.components.emplace_back(Component::MORALE, 0, -1, 0);
iw.components.emplace_back(Component::EComponentType::MORALE, 0, -1, 0);
iw.soundID = soundBase::GRAVEYARD;
break;
}
@@ -201,7 +201,7 @@ void CBank::doVisit(const CGHeroInstance * hero) const
gb.id = hero->id.getNum();
cb->giveHeroBonus(&gb);
textID = 107;
iw.components.emplace_back(Component::LUCK, 0, -2, 0);
iw.components.emplace_back(Component::EComponentType::LUCK, 0, -2, 0);
break;
}
case Obj::CREATURE_BANK:
@@ -225,7 +225,7 @@ void CBank::doVisit(const CGHeroInstance * hero) const
{
if (bc->resources[it] != 0)
{
iw.components.emplace_back(Component::RESOURCE, it, bc->resources[it], 0);
iw.components.emplace_back(Component::EComponentType::RESOURCE, it, bc->resources[it], 0);
loot << "%d %s";
loot.addReplacement(iw.components.back().val);
loot.addReplacement(MetaString::RES_NAMES, iw.components.back().subtype);
@@ -235,7 +235,7 @@ void CBank::doVisit(const CGHeroInstance * hero) const
//grant artifacts
for (auto & elem : bc->artifacts)
{
iw.components.emplace_back(Component::ARTIFACT, elem, 0, 0);
iw.components.emplace_back(Component::EComponentType::ARTIFACT, elem, 0, 0);
loot << "%s";
loot.addReplacement(MetaString::ART_NAMES, elem);
cb->giveHeroNewArtifact(hero, VLC->arth->objects[elem], ArtifactPosition::FIRST_AVAILABLE);
@@ -279,7 +279,7 @@ void CBank::doVisit(const CGHeroInstance * hero) const
if(hero->canLearnSpell(spell))
{
spells.insert(spellId);
iw.components.emplace_back(Component::SPELL, spellId, 0, 0);
iw.components.emplace_back(Component::EComponentType::SPELL, spellId, 0, 0);
}
}
else