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

Merge beta into develop

Browse Source
This commit is contained in:
Ivan Savenko
2023-04-11 19:37:35 +03:00
parent ff66592fad d9a2621231
commit dfa2e2a349
91 changed files with 730 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapObjects/CRewardableObject.cpp
View File

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