mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
Compile fixes for gcc, as per http://forum.vcmi.eu/viewtopic.php?p=9638#9638
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
@@ -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<bool>(tacticianInterface); //if we found interface of player with tactics, then enter tactics mode
|
||||
|
||||
//create stack queue
|
||||
bool embedQueue = screen->h < 700;
|
||||
|
@@ -217,7 +217,7 @@ void CAdventureAI::saveGame(COSer<CSaveFile> &h, const int version) /*saving */
|
||||
{
|
||||
LOG_TRACE_PARAMS(logAi, "version '%i'", version);
|
||||
CGlobalAI::saveGame(h, version);
|
||||
bool hasBattleAI = battleAI;
|
||||
bool hasBattleAI = static_cast<bool>(battleAI);
|
||||
h << hasBattleAI;
|
||||
if(hasBattleAI)
|
||||
{
|
||||
|
Reference in New Issue
Block a user