games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Merge pull request #541 from ilmikko/ilmikko-patch-fix-tribool-bool

Browse Source 
Fix broken build on libboost 1.69.0
This commit is contained in:
Alexander Shishkin 2019-01-24 22:41:07 +03:00 committed by GitHub
commit ccd416908e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/windows/CAdvmapInterface.cpp
View File

@ -126,7 +126,7 @@ void CTerrainRect::clickLeft(tribool down, bool previousState)
#ifdef VCMI_ANDROID
if(adventureInt->swipeEnabled)
{
if(handleSwipeStateChange(down == true))
if(handleSwipeStateChange((bool)down == true))
{
return; // if swipe is enabled, we don't process "down" events and wait for "up" (to make sure this wasn't a swiping gesture)
}
@ -162,7 +162,7 @@ void CTerrainRect::clickRight(tribool down, bool previousState)
void CTerrainRect::clickMiddle(tribool down, bool previousState)
{
handleSwipeStateChange(down == true);
handleSwipeStateChange((bool)down == true);
}
void CTerrainRect::mouseMoved(const SDL_MouseMotionEvent & sEvent)
@ -880,7 +880,7 @@ void CAdvMapInt::updateMoveHero(const CGHeroInstance *h, tribool hasPath)
if(boost::logic::indeterminate(hasPath))
hasPath = LOCPLINT->paths[h].nodes.size() ? true : false;
moveHero->block(!hasPath || (h->movement == 0));
moveHero->block(!(bool)hasPath || (h->movement == 0));
}
void CAdvMapInt::updateSpellbook(const CGHeroInstance *h)

4
lib/battle/CBattleInfoEssentials.cpp
View File

@ -411,7 +411,7 @@ bool CBattleInfoEssentials::battleMatchOwner(const battle::Unit * attacker, cons
if(boost::logic::indeterminate(positivness))
return true;
else if(attacker->unitId() == defender->unitId())
return positivness;
return (bool)positivness;
else
return battleMatchOwner(battleGetOwner(attacker), defender, positivness);
}
@ -425,5 +425,5 @@ bool CBattleInfoEssentials::battleMatchOwner(const PlayerColor & attacker, const
if(boost::logic::indeterminate(positivness))
return true;
else
return (attacker == initialOwner) == positivness;
return (attacker == initialOwner) == (bool)positivness;
}

2
lib/serializer/JsonSerializer.cpp
View File

@ -21,7 +21,7 @@ JsonSerializer::JsonSerializer(const IInstanceResolver * instanceResolver_, Json
void JsonSerializer::serializeInternal(const std::string & fieldName, boost::logic::tribool & value)
{
if(!boost::logic::indeterminate(value))
currentObject->operator[](fieldName).Bool() = value;
currentObject->operator[](fieldName).Bool() = (bool)value;
}
void JsonSerializer::serializeInternal(const std::string & fieldName, si32 & value, const boost::optional<si32> & defaultValue, const TDecoder & decoder, const TEncoder & encoder)

4
lib/spells/ISpellMechanics.cpp
View File

@ -607,7 +607,7 @@ bool BaseMechanics::isSmart() const
}
else
{
return smart;
return (bool)smart;
}
}
@ -620,7 +620,7 @@ bool BaseMechanics::isMassive() const
}
else
{
return massive;
return (bool)massive;
}
}