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 #3364 from IvanSavenko/scholar_fix

Browse Source 
Fix refusable Scholar
This commit is contained in:
Ivan Savenko
2023-12-23 21:54:13 +02:00
committed by GitHub
parent 20ede710c2 ec5fcb3e7c
commit 4220bb32a7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mapObjects/CRewardableObject.cpp
View File

@@ -111,12 +111,21 @@ void CRewardableObject::onHeroVisit(const CGHeroInstance *h) const
selectRewardWthMessage(h, rewards, configuration.onSelect); selectRewardWthMessage(h, rewards, configuration.onSelect);
break; break;
case Rewardable::SELECT_FIRST: // give first available case Rewardable::SELECT_FIRST: // give first available
if (configuration.canRefuse)
selectRewardWthMessage(h, { rewards.front() }, configuration.info.at(rewards.front()).message);
else
grantRewardWithMessage(h, rewards.front(), true); grantRewardWithMessage(h, rewards.front(), true);
break; break;
case Rewardable::SELECT_RANDOM: // give random case Rewardable::SELECT_RANDOM: // give random
grantRewardWithMessage(h, *RandomGeneratorUtil::nextItem(rewards, cb->gameState()->getRandomGenerator()), true); {
ui32 rewardIndex = *RandomGeneratorUtil::nextItem(rewards, cb->gameState()->getRandomGenerator());
if (configuration.canRefuse)
selectRewardWthMessage(h, { rewardIndex }, configuration.info.at(rewardIndex).message);
else
grantRewardWithMessage(h, rewardIndex, true);
break; break;
} }
}
break; break;
} }
} }