From 1811f0a71b8b0695f7b510dd36288133c9876fc8 Mon Sep 17 00:00:00 2001 From: Marek Kochanowicz Date: Sat, 21 Dec 2013 15:40:39 +0100 Subject: [PATCH] Works, but it seems that I miss something in referencables. I will write post on the forum. --- apps/opencs/model/tools/referenceablecheck.cpp | 11 +++++------ apps/opencs/model/tools/reportmodel.cpp | 2 +- apps/opencs/model/tools/tools.cpp | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/opencs/model/tools/referenceablecheck.cpp b/apps/opencs/model/tools/referenceablecheck.cpp index b299744d6..e86e8db54 100644 --- a/apps/opencs/model/tools/referenceablecheck.cpp +++ b/apps/opencs/model/tools/referenceablecheck.cpp @@ -30,16 +30,15 @@ void CSMTools::ReferenceableCheckStage::perform(int stage, std::vector< std::str { //Checks for books, than, when stage is above mBooksSize goes to other checks, with (stage - PrevSum) as stage. - if (stage <= mBooksSize) + if (stage < mBooksSize) { bookCheck(stage, mReferencables.getBooks(), messages); - std::cout<<"Book checking \n"; return; } stage -= mBooksSize; - if (stage <= mActivatorsSize) + if (stage < mActivatorsSize) { activatorCheck(stage, mReferencables.getActivators(), messages); return; @@ -47,7 +46,7 @@ void CSMTools::ReferenceableCheckStage::perform(int stage, std::vector< std::str stage -= mActivatorsSize; - if (stage <= mPotionsSize) + if (stage < mPotionsSize) { potionCheck(stage, mReferencables.getPotions(), messages); return; @@ -55,7 +54,7 @@ void CSMTools::ReferenceableCheckStage::perform(int stage, std::vector< std::str stage -= mPotionsSize; - if (stage <= mApparatiSize) + if (stage < mApparatiSize) { apparatusCheck(stage, mReferencables.getApparati(), messages); return; @@ -223,4 +222,4 @@ void CSMTools::ReferenceableCheckStage::apparatusCheck(int stage, const CSMWorld { messages.push_back(id.toString() + "|" + Apparatus.mId + " has no icon"); } -} \ No newline at end of file +} diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp index b12531875..d88361746 100644 --- a/apps/opencs/model/tools/reportmodel.cpp +++ b/apps/opencs/model/tools/reportmodel.cpp @@ -68,4 +68,4 @@ void CSMTools::ReportModel::add (const std::string& row) const CSMWorld::UniversalId& CSMTools::ReportModel::getUniversalId (int row) const { return mRows.at (row).first; -} \ No newline at end of file +} diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp index bca9f6fb7..d8cbb2fc1 100644 --- a/apps/opencs/model/tools/tools.cpp +++ b/apps/opencs/model/tools/tools.cpp @@ -76,7 +76,7 @@ CSMDoc::Operation *CSMTools::Tools::getVerifier() mVerifier->appendStage (new SpellCheckStage (mData.getSpells())); - mVerifier->appendStage( new ReferenceableCheckStage (mData.getReferenceables().getDataSet())); + mVerifier->appendStage (new ReferenceableCheckStage (mData.getReferenceables().getDataSet())); } return mVerifier;