games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Compile fixes for gcc, as per http://forum.vcmi.eu/viewtopic.php?p=9638#9638

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2013-06-23 12:36:18 +00:00
parent 04d11519ef
commit 06f0a29b31
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/CCastleInterface.cpp
View File

@@ -825,8 +825,9 @@ void CCastleBuildings::enterTownHall()
if(!vstd::contains(town->forbiddenBuildings, BuildingID::GRAIL)) 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? 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), [&]{ LOCPLINT->cb->buildBuilding(town, BuildingID::GRAIL); },
boost::bind(&CCastleBuildings::openTownHall, this), true); [&]{ openTownHall(); },
true);
} }
else else
{ {

2
client/battle/CBattleInterface.cpp
View File

@@ -117,7 +117,7 @@ CBattleInterface::CBattleInterface(const CCreatureSet * army1, const CCreatureSe
else if(defenderInt && defenderInt->cb->battleGetTacticDist()) else if(defenderInt && defenderInt->cb->battleGetTacticDist())
tacticianInterface = defenderInt; 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 //create stack queue
bool embedQueue = screen->h < 700; bool embedQueue = screen->h < 700;

2
lib/CGameInterface.cpp
View File

@@ -217,7 +217,7 @@ void CAdventureAI::saveGame(COSer<CSaveFile> &h, const int version) /*saving */
{ {
LOG_TRACE_PARAMS(logAi, "version '%i'", version); LOG_TRACE_PARAMS(logAi, "version '%i'", version);
CGlobalAI::saveGame(h, version); CGlobalAI::saveGame(h, version);
bool hasBattleAI = battleAI; bool hasBattleAI = static_cast<bool>(battleAI);
h << hasBattleAI; h << hasBattleAI;
if(hasBattleAI) if(hasBattleAI)
{ {