mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

small oops + added new variables to the constructor

Browse Source
This commit is contained in:
Marek Kochanowicz 2013-12-28 17:35:04 +01:00
parent b9d1047ad6
commit 147ee0ace3
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/tools/referenceablecheck.cpp
View File

@ -9,8 +9,10 @@
#include "../world/universalid.hpp" #include "../world/universalid.hpp"
CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable) : CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable, const CSMWorld::IdCollection<ESM::ace >& races, const CSMWorld::IdCollection<ESM::Class>& classes) :
mReferencables(referenceable), mReferencables(referenceable),
mClasses(classes),
mRaces(races),
mBooksSize(mReferencables.getBooks().getSize()), mBooksSize(mReferencables.getBooks().getSize()),
mActivatorsSize(mReferencables.getActivators().getSize()), mActivatorsSize(mReferencables.getActivators().getSize()),
mPotionsSize(mReferencables.getPotions().getSize()), mPotionsSize(mReferencables.getPotions().getSize()),
@ -913,7 +915,7 @@ void CSMTools::ReferenceableCheckStage::npcCheck(int stage, const CSMWorld::RefI
if (Gold < 0) if (Gold < 0)
{ {
messages.push_back(id.toString() + "|" + NPC.mId + " gold is negative value"); messages.push_back(id.toString() + "|" + NPC.mId + " gold has negative value");
} }
if (NPC.mName.empty()) if (NPC.mName.empty())

6
apps/opencs/model/tools/referenceablecheck.hpp
View File

@ -11,7 +11,7 @@ namespace CSMTools
class ReferenceableCheckStage : public CSMDoc::Stage class ReferenceableCheckStage : public CSMDoc::Stage
{ {
public: public:
ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable); ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable, const CSMWorld::IdCollection<ESM::Race>& races, const CSMWorld::IdCollection<ESM::Class>& classes);
virtual void perform(int stage, std::vector< std::string >& messages); virtual void perform(int stage, std::vector< std::string >& messages);
virtual int setup(); virtual int setup();
@ -34,7 +34,9 @@ namespace CSMTools
void miscCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, std::vector<std::string>& messages); void miscCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Miscellaneous>& records, std::vector<std::string>& messages);
void npcCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, std::vector<std::string>& messages); void npcCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::NPC>& records, std::vector<std::string>& messages);
const CSMWorld::RefIdData mReferencables; const CSMWorld::RefIdData& mReferencables;
const CSMWorld::IdCollection<ESM::Race> mRaces;
const CSMWorld::IdCollection<ESM::Class> mClasses;
//SIZES OF CONCRETE TYPES //SIZES OF CONCRETE TYPES
const int mBooksSize; const int mBooksSize;

2
apps/opencs/model/tools/tools.cpp
View File

@ -76,7 +76,7 @@ CSMDoc::Operation *CSMTools::Tools::getVerifier()
mVerifier->appendStage (new SpellCheckStage (mData.getSpells())); mVerifier->appendStage (new SpellCheckStage (mData.getSpells()));
mVerifier->appendStage (new ReferenceableCheckStage (mData.getReferenceables().getDataSet())); mVerifier->appendStage (new ReferenceableCheckStage (mData.getReferenceables().getDataSet()), mData.getRaces(), mData.getClasses());
} }
return mVerifier; return mVerifier;