From 06f0a29b31bf83f803fe92dc5dd297433041467b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= Date: Sun, 23 Jun 2013 12:36:18 +0000 Subject: [PATCH] Compile fixes for gcc, as per http://forum.vcmi.eu/viewtopic.php?p=9638#9638 --- client/CCastleInterface.cpp | 5 +++-- client/battle/CBattleInterface.cpp | 2 +- lib/CGameInterface.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/CCastleInterface.cpp b/client/CCastleInterface.cpp index d76f786ad..08a4bcb42 100644 --- a/client/CCastleInterface.cpp +++ b/client/CCastleInterface.cpp @@ -825,8 +825,9 @@ void CCastleBuildings::enterTownHall() if(!vstd::contains(town->forbiddenBuildings, BuildingID::GRAIL)) { LOCPLINT->showYesNoDialog(CGI->generaltexth->allTexts[597], //Do you wish this to be the permanent home of the Grail? - boost::bind(&CCallback::buildBuilding, LOCPLINT->cb, town, BuildingID::GRAIL), - boost::bind(&CCastleBuildings::openTownHall, this), true); + [&]{ LOCPLINT->cb->buildBuilding(town, BuildingID::GRAIL); }, + [&]{ openTownHall(); }, + true); } else { diff --git a/client/battle/CBattleInterface.cpp b/client/battle/CBattleInterface.cpp index c3a7f2540..df372abc4 100644 --- a/client/battle/CBattleInterface.cpp +++ b/client/battle/CBattleInterface.cpp @@ -117,7 +117,7 @@ CBattleInterface::CBattleInterface(const CCreatureSet * army1, const CCreatureSe else if(defenderInt && defenderInt->cb->battleGetTacticDist()) tacticianInterface = defenderInt; - tacticsMode = tacticianInterface; //if we found interface of player with tactics, then enter tactics mode + tacticsMode = static_cast(tacticianInterface); //if we found interface of player with tactics, then enter tactics mode //create stack queue bool embedQueue = screen->h < 700; diff --git a/lib/CGameInterface.cpp b/lib/CGameInterface.cpp index 4f48b1961..9e2b441c2 100644 --- a/lib/CGameInterface.cpp +++ b/lib/CGameInterface.cpp @@ -217,7 +217,7 @@ void CAdventureAI::saveGame(COSer &h, const int version) /*saving */ { LOG_TRACE_PARAMS(logAi, "version '%i'", version); CGlobalAI::saveGame(h, version); - bool hasBattleAI = battleAI; + bool hasBattleAI = static_cast(battleAI); h << hasBattleAI; if(hasBattleAI) {