From 946dd16696761a8e87565ed1bd93826b05b0e6b8 Mon Sep 17 00:00:00 2001 From: dteviot Date: Mon, 26 Jan 2015 13:57:22 +1300 Subject: [PATCH] Fixed Windows warning. warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning) --- apps/essimporter/converter.hpp | 2 +- components/esm/loadcell.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp index 6f85b01cf..90b75fee1 100644 --- a/apps/essimporter/converter.hpp +++ b/apps/essimporter/converter.hpp @@ -263,7 +263,7 @@ public: for (std::vector::const_iterator it = pcdt.mFactions.begin(); it != pcdt.mFactions.end(); ++it) { ESM::NpcStats::Faction faction; - faction.mExpelled = it->mFlags & 0x2; + faction.mExpelled = (it->mFlags & 0x2) != 0; faction.mRank = it->mRank; faction.mReputation = it->mReputation; mContext->mPlayer.mObject.mNpcStats.mFactions[it->mFactionName.toString()] = faction; diff --git a/components/esm/loadcell.hpp b/components/esm/loadcell.hpp index 4c2ac68dc..d982bbfd4 100644 --- a/components/esm/loadcell.hpp +++ b/components/esm/loadcell.hpp @@ -137,7 +137,7 @@ struct Cell bool hasWater() const { - return (mData.mFlags&HasWater); + return (mData.mFlags&HasWater) != 0; } // Restore the given reader to the stored position. Will try to open