games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix after merge

Browse Source
This commit is contained in:
nordsoft
2023-05-05 00:14:44 +04:00
parent ce80c83ca2
commit 67331c5520
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/CGTownBuilding.cpp
View File

@@ -302,11 +302,11 @@ void CTownRewardableBuilding::initObj(CRandomGenerator & rand)
{ {
for (auto & bonus : rewardInfo.reward.bonuses) for (auto & bonus : rewardInfo.reward.bonuses)
{ {
bonus.source = Bonus::TOWN_STRUCTURE; bonus.source = BonusSource::TOWN_STRUCTURE;
bonus.sid = bID; bonus.sid = bID;
if (bonus.type == Bonus::MORALE) if (bonus.type == BonusType::MORALE)
rewardInfo.reward.extraComponents.emplace_back(Component::EComponentType::MORALE, 0, bonus.val, 0); rewardInfo.reward.extraComponents.emplace_back(Component::EComponentType::MORALE, 0, bonus.val, 0);
if (bonus.type == Bonus::LUCK) if (bonus.type == BonusType::LUCK)
rewardInfo.reward.extraComponents.emplace_back(Component::EComponentType::LUCK, 0, bonus.val, 0); rewardInfo.reward.extraComponents.emplace_back(Component::EComponentType::LUCK, 0, bonus.val, 0);
} }
} }
@@ -391,7 +391,7 @@ bool CTownRewardableBuilding::wasVisitedBefore(const CGHeroInstance * contextHer
case Rewardable::VISIT_PLAYER: case Rewardable::VISIT_PLAYER:
return false; //not supported return false; //not supported
case Rewardable::VISIT_BONUS: case Rewardable::VISIT_BONUS:
return contextHero->hasBonusFrom(Bonus::TOWN_STRUCTURE, Bonus::getSid32(town->town->faction->getIndex(), bID)); return contextHero->hasBonusFrom(BonusSource::TOWN_STRUCTURE, Bonus::getSid32(town->town->faction->getIndex(), bID));
case Rewardable::VISIT_HERO: case Rewardable::VISIT_HERO:
return visitors.find(contextHero->id) != visitors.end(); return visitors.find(contextHero->id) != visitors.end();
default: default: