From a61019dfa804fc2d1a6d54ec7e6600cacda22116 Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Sun, 15 Feb 2015 04:47:25 +0100 Subject: [PATCH] Update referencecheck.cpp MSVC does not allow for the usage of 'and' or 'or' literals --- apps/opencs/model/tools/referencecheck.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/opencs/model/tools/referencecheck.cpp b/apps/opencs/model/tools/referencecheck.cpp index aae83bd5ea..0c1d7d38f3 100644 --- a/apps/opencs/model/tools/referencecheck.cpp +++ b/apps/opencs/model/tools/referencecheck.cpp @@ -53,7 +53,7 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &message messages.push_back(std::make_pair(id, " is referencing object from non existing cell " + cellRef.mCell)); // If object have owner, check if that owner reference is valid - if (!cellRef.mOwner.empty() and mReferencables.searchId(cellRef.mOwner) == -1) + if (!cellRef.mOwner.empty() && mReferencables.searchId(cellRef.mOwner) == -1) messages.push_back(std::make_pair(id, " has non existing owner " + cellRef.mOwner)); // If object have creature soul trapped, check if that creature reference is valid @@ -107,4 +107,4 @@ void CSMTools::ReferenceCheckStage::perform(int stage, CSMDoc::Messages &message int CSMTools::ReferenceCheckStage::setup() { return mReferences.getSize(); -} \ No newline at end of file +}