1 From aa00fdbd0e99b2beec382c7677a64d962b748dcb Mon Sep 17 00:00:00 2001
2 From: Rohit Nirmal <rohitnirmal9@gmail.com>
3 Date: Wed, 6 May 2015 19:16:51 -0500
4 Subject: [PATCH] Fix building with Boost 1.58.
8 lib/CArtHandler.cpp | 2 +-
9 lib/CGameInfoCallback.cpp | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
12 diff --git a/CCallback.cpp b/CCallback.cpp
13 index 8009bc7..da280db 100644
16 @@ -80,7 +80,7 @@ void CCallback::recruitCreatures(const CGDwelling *obj, const CArmedInstance * d
18 bool CCallback::dismissCreature(const CArmedInstance *obj, SlotID stackPos)
\r
20 - if(((player>=0) && obj->tempOwner != player) || (obj->stacksCount()<2 && obj->needsLastStack()))
\r
21 + if((player && obj->tempOwner != player) || (obj->stacksCount()<2 && obj->needsLastStack()))
\r
24 DisbandCreature pack(stackPos,obj->id);
\r
25 diff --git a/lib/CArtHandler.cpp b/lib/CArtHandler.cpp
26 index 2d9dd01..0026a66 100644
27 --- a/lib/CArtHandler.cpp
28 +++ b/lib/CArtHandler.cpp
29 @@ -671,7 +671,7 @@ boost::optional<std::vector<CArtifact*>&> CArtHandler::listFromClass( CArtifact:
30 case CArtifact::ART_RELIC:
\r
32 default: //special artifacts should not be erased
\r
34 + return boost::optional<std::vector<CArtifact*>&>();
\r
38 diff --git a/lib/CGameInfoCallback.cpp b/lib/CGameInfoCallback.cpp
39 index 051bb9c..2a59b96 100644
40 --- a/lib/CGameInfoCallback.cpp
41 +++ b/lib/CGameInfoCallback.cpp
42 @@ -403,7 +403,7 @@ std::vector <const CGObjectInstance * > CGameInfoCallback::getVisitableObjs(int3
44 for(const CGObjectInstance * obj : t->visitableObjects)
46 - if(player < nullptr || obj->ID != Obj::EVENT) //hide events from players
47 + if(player || obj->ID != Obj::EVENT) //hide events from players