games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

- Refactored method CGameState::init

Browse Source
This commit is contained in:
beegee1
2013-12-18 18:18:12 +00:00
parent 61fc216a6f
commit f0cbbbdb70
7 changed files with 836 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapping/CCampaignHandler.cpp
View File

@@ -443,10 +443,9 @@ boost::optional<CScenarioTravel::STravelBonus> CCampaignState::getBonusForCurren
{
auto bonuses = getCurrentScenario().travelOptions.bonusesToChoose;
assert(chosenCampaignBonuses.count(*currentMap) || bonuses.size() == 0);
if(bonuses.size())
return bonuses[currentBonusID()];
else
return boost::optional<CScenarioTravel::STravelBonus>();
if(bonuses.empty()) return boost::optional<CScenarioTravel::STravelBonus>();
else return bonuses[currentBonusID()];
}
const CCampaignScenario & CCampaignState::getCurrentScenario() const