games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00
Code Issues Releases Activity

Player can refuse single reward (e.g. Tree of Knowledge)

Browse Source
This commit is contained in:
Ivan Savenko 2014-04-12 14:47:20 +03:00
parent a4e7987835
commit cb5b5a05c1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/CObjectWithReward.cpp
View File

@ -95,6 +95,16 @@ void CObjectWithReward::onHeroVisit(const CGHeroInstance *h) const
cb->showInfoDialog(&iw);
}
};
auto selectRewardsMessage = [&](std::vector<ui32> rewards) -> void
{
BlockingDialog sd(canRefuse, rewards.size() > 1);
sd.player = h->tempOwner;
sd.soundID = soundID;
sd.text = onSelect;
for (auto index : rewards)
sd.components.push_back(info[index].reward.getDisplayedComponent());
cb->showBlockingDialog(&sd);
};
if (!wasVisited(h))
{
@ -116,23 +126,18 @@ void CObjectWithReward::onHeroVisit(const CGHeroInstance *h) const
}
case 1: // one reward. Just give it with message
{
grantRewardWithMessage(rewards[0]);
if (canRefuse)
selectRewardsMessage(rewards);
else
grantRewardWithMessage(rewards[0]);
break;
}
default: // multiple rewards. Act according to select mode
{
switch (selectMode) {
case SELECT_PLAYER: // player must select
{
BlockingDialog sd(canRefuse, true);
sd.player = h->tempOwner;
sd.soundID = soundID;
sd.text = onSelect;
for (auto index : rewards)
sd.components.push_back(info[index].reward.getDisplayedComponent());
cb->showBlockingDialog(&sd);
selectRewardsMessage(rewards);
break;
}
case SELECT_FIRST: // give first available
grantRewardWithMessage(rewards[0]);
break;
@ -445,7 +450,7 @@ void CGPickable::initObj()
blockVisit = true;
switch(ID)
{
case Obj::CAMPFIRE:
case Obj::CAMPFIRE: //FIXME: campfire is not functioning correctly in game (no visible message)
{
soundID = soundBase::experience;
int givenRes = cb->gameState()->getRandomGenerator().nextInt(5);