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

bind -> std::bind

Browse Source
This commit is contained in:
Ilya Pomaskin
2014-10-10 14:36:35 +04:00
committed by Patrick Simmons
parent 41e93a66ce
commit ff12aca83a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/CPreGame.cpp
View File

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