1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-30 04:30:42 +02:00

Merge pull request #42 from IlyaPomaskin/patch-2

Merged for Ivan's request.
This commit is contained in:
DjWarmonger 2014-10-19 21:32:57 +02:00
commit a7c16fb275

View File

@ -3194,7 +3194,7 @@ void CBonusSelection::init()
//bonus choosing
graphics->fonts[FONT_MEDIUM]->renderTextLeft(background, CGI->generaltexth->allTexts[71], Colors::WHITE, Point(511, 432));
bonuses = new CToggleGroup(bind(&CBonusSelection::selectBonus, this, _1));
bonuses = new CToggleGroup(std::bind(&CBonusSelection::selectBonus, this, _1));
//set left part of window
bool isCurrentMapConquerable = ourCampaign->currentMap && ourCampaign->camp->conquerable(*ourCampaign->currentMap);
@ -3447,7 +3447,7 @@ void CBonusSelection::updateBonusSelection()
updateStartButtonState(-1);
delete bonuses;
bonuses = new CToggleGroup(bind(&CBonusSelection::selectBonus, this, _1));
bonuses = new CToggleGroup(std::bind(&CBonusSelection::selectBonus, this, _1));
static const char *bonusPics[] = {"SPELLBON.DEF", "TWCRPORT.DEF", "", "ARTIFBON.DEF", "SPELLBON.DEF",
"PSKILBON.DEF", "SSKILBON.DEF", "BORES.DEF", "PORTRAITSLARGE", "PORTRAITSLARGE"};