Merge remote-tracking branch 'sirherrbatka/referencables_verifer'

apps/opencs/CMakeLists.txt

@@ -38,7 +38,7 @@ opencs_units (model/tools
 
 opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
-    birthsigncheck spellcheck
+    birthsigncheck spellcheck referenceablecheck
     )
 
 

apps/opencs/model/tools/referenceablecheck.hpp

@@ -0,0 +1,78 @@
+#ifndef REFERENCEABLECHECKSTAGE_H
+#define REFERENCEABLECHECKSTAGE_H
+
+#include "../world/universalid.hpp"
+#include "../doc/stage.hpp"
+#include "../world/data.hpp"
+#include "../world/refiddata.hpp"
+
+namespace CSMTools
+{
+    class ReferenceableCheckStage : public CSMDoc::Stage
+    {
+        public:
+            ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable,
+				    const CSMWorld::IdCollection<ESM::Race>& races,
+				    const CSMWorld::IdCollection<ESM::Class>& classes,
+				    const CSMWorld::IdCollection<ESM::Faction>& factions);
+
+            virtual void perform(int stage, std::vector< std::string >& messages);
+            virtual int setup();
+
+        private:
+            //CONCRETE CHECKS
+            void bookCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Book >& records, std::vector< std::string >& messages);
+            void activatorCheck(int stage, const CSMWorld::RefIdDataContainer< ESM::Activator >& records, std::vector< std::string >& messages);
+            void potionCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Potion>& records, std::vector<std::string>& messages);
+            void apparatusCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Apparatus>& records, std::vector<std::string>& messages);
+            void armorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Armor>& records, std::vector<std::string>& messages);
+            void clothingCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Clothing>& records, std::vector<std::string>& messages);
+            void containerCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Container>& records, std::vector<std::string>& messages);
+            void creatureCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Creature>& records, std::vector<std::string>& messages);
+            void doorCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Door>& records, std::vector<std::string>& messages);
+            void ingredientCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Ingredient>& records, std::vector<std::string>& messages);
+            void creaturesLevListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::CreatureLevList>& records, std::vector<std::string>& messages);
+            void itemLevelledListCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::ItemLevList>& records, std::vector<std::string>& messages);
+            void lightCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Light>& records, std::vector<std::string>& messages);
+            void lockpickCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Lockpick>& 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 weaponCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Weapon>& records, std::vector<std::string>& messages);
+            void probeCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Probe>& records, std::vector<std::string>& messages);
+            void repairCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Repair>& records, std::vector<std::string>& messages);
+            void staticCheck(int stage, const CSMWorld::RefIdDataContainer<ESM::Static>& records, std::vector<std::string>& messages);
+            
+            //FINAL CHECK
+            void finalCheck(std::vector<std::string>& messages);
+            
+	    //TEMPLATE CHECKS
+	    template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
+                                                            std::vector<std::string>& messages,
+                                                            const std::string& someID,
+                                                            bool enchantable); //for all enchantable items.
+            
+	    template<typename ITEM> void inventoryItemCheck(const ITEM& someItem,
+                                                            std::vector<std::string>& messages,
+                                                            const std::string& someID); //for non-enchantable items.
+            
+	    template<typename TOOL> void toolCheck(const TOOL& someTool,
+                                                   std::vector<std::string>& messages,
+                                                   const std::string& someID,
+                                                   bool canbebroken); //for tools with uses.
+            
+	    template<typename TOOL> void toolCheck(const TOOL& someTool,
+                                                   std::vector<std::string>& messages,
+                                                   const std::string& someID); //for tools without uses.
+
+	    template<typename LIST> void listCheck(const LIST& someList,
+                                                   std::vector< std::string >& messages,
+                                                   const std::string& someID);
+	    
+            const CSMWorld::RefIdData& mReferencables;
+            const CSMWorld::IdCollection<ESM::Race>& mRaces;
+            const CSMWorld::IdCollection<ESM::Class>& mClasses;
+            const CSMWorld::IdCollection<ESM::Faction>& mFactions;
+            bool mPlayerPresent;
+    };
+}
+#endif // REFERENCEABLECHECKSTAGE_H

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;
-}
+}

apps/opencs/model/tools/tools.cpp

@@ -19,6 +19,7 @@
 #include "regioncheck.hpp"
 #include "birthsigncheck.hpp"
 #include "spellcheck.hpp"
+#include "referenceablecheck.hpp"
 
 CSMDoc::Operation *CSMTools::Tools::get (int type)
 {
@@ -74,6 +75,8 @@ CSMDoc::Operation *CSMTools::Tools::getVerifier()
         mVerifier->appendStage (new BirthsignCheckStage (mData.getBirthsigns()));
 
         mVerifier->appendStage (new SpellCheckStage (mData.getSpells()));
+
+	mVerifier->appendStage (new ReferenceableCheckStage (mData.getReferenceables().getDataSet(), mData.getRaces(), mData.getClasses(), mData.getFactions()));
     }
 
     return mVerifier;
@@ -138,4 +141,5 @@ void CSMTools::Tools::verifierMessage (const QString& message, int type)
 
     if (iter!=mActiveReports.end())
         mReports[iter->second]->add (message.toStdString());
-}
+}
+

apps/opencs/model/world/refidcollection.cpp

@@ -549,3 +549,9 @@ void CSMWorld::RefIdCollection::save (int index, ESM::ESMWriter& writer) const
 {
     mData.save (index, writer);
 }
+
+const CSMWorld::RefIdData& CSMWorld::RefIdCollection::getDataSet() const
+{
+    return mData;
+}
+

apps/opencs/model/world/refidcollection.hpp

@@ -107,7 +107,10 @@ namespace CSMWorld
             /// \return Success?
 
             void save (int index, ESM::ESMWriter& writer) const;
+
+	    const RefIdData& getDataSet() const; //I can't figure out a better name for this one :(
     };
 }
 
 #endif
+

apps/opencs/model/world/refiddata.cpp

@@ -230,4 +230,104 @@ void CSMWorld::RefIdData::save (int index, ESM::ESMWriter& writer) const
         throw std::logic_error ("invalid local index type");
 
     iter->second->save (localIndex.first, writer);
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Book >& CSMWorld::RefIdData::getBooks() const
+{
+    return mBooks;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Activator >& CSMWorld::RefIdData::getActivators() const
+{
+    return mActivators;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Potion >& CSMWorld::RefIdData::getPotions() const
+{
+    return mPotions;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Apparatus >& CSMWorld::RefIdData::getApparati() const
+{
+    return mApparati;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Armor >& CSMWorld::RefIdData::getArmors() const
+{
+    return mArmors;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Clothing >& CSMWorld::RefIdData::getClothing() const
+{
+    return mClothing;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Container >& CSMWorld::RefIdData::getContainers() const
+{
+    return mContainers;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Creature >& CSMWorld::RefIdData::getCreatures() const
+{
+    return mCreatures;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Door >& CSMWorld::RefIdData::getDoors() const
+{
+    return mDoors;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Ingredient >& CSMWorld::RefIdData::getIngredients() const
+{
+    return mIngredients;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::CreatureLevList >& CSMWorld::RefIdData::getCreatureLevelledLists() const
+{
+    return mCreatureLevelledLists;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::ItemLevList >& CSMWorld::RefIdData::getItemLevelledList() const
+{
+    return mItemLevelledLists;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Light >& CSMWorld::RefIdData::getLights() const
+{
+    return mLights;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Lockpick >& CSMWorld::RefIdData::getLocpicks() const
+{
+    return mLockpicks;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Miscellaneous >& CSMWorld::RefIdData::getMiscellaneous() const
+{
+    return mMiscellaneous;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::NPC >& CSMWorld::RefIdData::getNPCs() const
+{
+    return mNpcs;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Weapon >& CSMWorld::RefIdData::getWeapons() const
+{
+    return mWeapons;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Probe >& CSMWorld::RefIdData::getProbes() const
+{
+    return mProbes;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Repair >& CSMWorld::RefIdData::getRepairs() const
+{
+    return mRepairs;
+}
+
+const CSMWorld::RefIdDataContainer< ESM::Static >& CSMWorld::RefIdData::getStatics() const
+{
+    return mStatics;
 }

apps/opencs/model/world/refiddata.hpp

@@ -219,7 +219,33 @@ namespace CSMWorld
             /// \param listDeleted include deleted record in the list
 
             void save (int index, ESM::ESMWriter& writer) const;
+
+	    //RECORD CONTAINERS ACCESS METHODS
+	    const RefIdDataContainer<ESM::Book>& getBooks() const;
+	    const RefIdDataContainer<ESM::Activator>& getActivators() const;
+	    const RefIdDataContainer<ESM::Potion>& getPotions() const;
+	    const RefIdDataContainer<ESM::Apparatus>& getApparati() const;
+	    const RefIdDataContainer<ESM::Armor>& getArmors() const;
+	    const RefIdDataContainer<ESM::Clothing>& getClothing() const;
+	    const RefIdDataContainer<ESM::Container>& getContainers() const;
+	    const RefIdDataContainer<ESM::Creature>& getCreatures() const;
+	    const RefIdDataContainer<ESM::Door>& getDoors() const;
+	    const RefIdDataContainer<ESM::Ingredient>& getIngredients() const;
+	    const RefIdDataContainer<ESM::CreatureLevList>& getCreatureLevelledLists() const;
+	    const RefIdDataContainer<ESM::ItemLevList>& getItemLevelledList() const;
+	    const RefIdDataContainer<ESM::Light>& getLights() const;
+	    const RefIdDataContainer<ESM::Lockpick>& getLocpicks() const;
+	    const RefIdDataContainer<ESM::Miscellaneous>& getMiscellaneous() const;
+	    const RefIdDataContainer<ESM::NPC>& getNPCs() const;
+	    const RefIdDataContainer<ESM::Weapon >& getWeapons() const;
+	    const RefIdDataContainer<ESM::Probe >& getProbes() const;
+	    const RefIdDataContainer<ESM::Repair>& getRepairs() const;
+	    const RefIdDataContainer<ESM::Static>& getStatics() const;
     };
 }
 
 #endif
+
+
+
+

components/esm/loadcrea.hpp

@@ -66,7 +66,7 @@ struct Creature
         int mCombat, mMagic, mStealth; // Don't know yet.
         int mAttack[6]; // AttackMin1, AttackMax1, ditto2, ditto3
         int mGold;
-    }; // 96 bytes
+    }; // 96 byte
 
     NPDTstruct mData;
 

components/esm/loadnpc.hpp

@@ -105,7 +105,7 @@ struct NPC
 
     char mNpdtType;
     NPDTstruct52 mNpdt52;
-    NPDTstruct12 mNpdt12; // Use this if npdt52.gold == -10
+    NPDTstruct12 mNpdt12; //for autocalculated characters
 
     int mFlags;