games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-13 11:40:38 +02:00
Code Issues Releases Activity

Merge pull request #20 from Haryaalcar/develop

Browse Source 
build fixes for mac os
This commit is contained in:
Ivan Savenko 2014-06-26 16:31:50 +03:00
commit 94e661b2bf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/VCAI/VCAI.cpp
View File

@ -196,7 +196,7 @@ void VCAI::showShipyardDialog(const IShipyard *obj)
void VCAI::gameOver(PlayerColor player, const EVictoryLossCheckResult & victoryLossCheckResult)
{
LOG_TRACE_PARAMS(logAi, "victoryLossCheckResult '%s'", victoryLossCheckResult);
LOG_TRACE_PARAMS(logAi, "victoryLossCheckResult '%s'", victoryLossCheckResult.messageToSelf);
NET_EVENT_HANDLER;
logAi->debugStream() << boost::format("Player %d: I heard that player %d %s.") % playerID % player.getNum() % (victoryLossCheckResult.victory() ? "won" : "lost");
if(player == playerID)

2
lib/NetPacks.h
View File

@ -1516,7 +1516,7 @@ struct ObstaclesRemoved : public CPackForClient //3014
};
//FIXME: figure out why gcc fails to find type_info for this class with -fvisibility=hidden flag set
#ifdef __linux__
#if defined(__linux__) || defined(__APPLE__)
struct DLL_LINKAGE CatapultAttack : public CPackForClient //3015
#else
struct CatapultAttack : public CPackForClient //3015

2
lib/mapObjects/CObjectClassesHandler.h
View File

@ -65,7 +65,7 @@ public:
walkersStrength(0)
{}
bool operator <(const CArmyStructure & other)
bool operator <(const CArmyStructure & other) const
{
return this->totalStrength < other.totalStrength;
}