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

Merge pull request #1905 from IvanSavenko/fix_rewardables

Browse Source 
Fixed UI of objects that provide one reward that can be refused
This commit is contained in:
Ivan Savenko
2023-04-08 22:15:22 +03:00
committed by GitHub
parent 1d6192ca62 50da080130
commit ae5d273df9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CRewardableObject.cpp
View File

@@ -152,8 +152,14 @@ void CRewardableObject::onHeroVisit(const CGHeroInstance *h) const
BlockingDialog sd(canRefuse, rewards.size() > 1); BlockingDialog sd(canRefuse, rewards.size() > 1);
sd.player = h->tempOwner; sd.player = h->tempOwner;
sd.text = dialog; sd.text = dialog;
if (rewards.size() > 1)
for (auto index : rewards) for (auto index : rewards)
sd.components.push_back(info[index].reward.getDisplayedComponent(h)); sd.components.push_back(info[index].reward.getDisplayedComponent(h));
if (rewards.size() == 1)
info[rewards[0]].reward.loadComponents(sd.components, h);
cb->showBlockingDialog(&sd); cb->showBlockingDialog(&sd);
}; };