games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +02:00
Code Issues Releases Activity

Avoid boost::optional assignment for Boost 1.64 compatibility (#360)

Browse Source 
Two options here: to use emplace from 1.56 or boost::make_optional.
Unfortunately Ubuntu 14.04 is using 1.54 and I'd rather not to break it.
This commit is contained in:
ArseniyShestakov
2017-08-05 16:09:29 +03:00
committed by GitHub
parent 4388e12a3a
commit cb40c093f8
12 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/CPreGame.cpp
View File

@ -3697,7 +3697,7 @@ void CBonusSelection::updateBonusSelection()
anim->setCustom(picName, 0);
bonusButton->setImage(anim);
const SDL_Color brightYellow = { 242, 226, 110, 0 };
bonusButton->borderColor = brightYellow;
bonusButton->borderColor = boost::make_optional(brightYellow);
bonuses->addToggle(i, bonusButton);
}
@ -3710,7 +3710,7 @@ void CBonusSelection::updateBonusSelection()
void CBonusSelection::updateCampaignState()
{
ourCampaign->currentMap = selectedMap;
ourCampaign->currentMap = boost::make_optional(selectedMap);
if (selectedBonus)
ourCampaign->chosenCampaignBonuses[selectedMap] = *selectedBonus;
}
@ -3777,7 +3777,7 @@ void CBonusSelection::selectBonus(int id)
// have to be undrawn/drawn.
if (!selectedBonus || *selectedBonus != id)
{
selectedBonus = id;
selectedBonus = boost::make_optional(id);
GH.totalRedraw();
updateStartButtonState(id);