added missing record classes

apps/openmw/CMakeLists.txt

@@ -98,6 +98,21 @@ set(GAMECLASS
     mwclass/npc.cpp
     mwclass/weapon.cpp
     mwclass/armor.cpp
+    mwclass/potion.cpp
+    mwclass/apparatus.cpp
+    mwclass/book.cpp
+    mwclass/clothing.cpp
+    mwclass/container.cpp
+    mwclass/door.cpp
+    mwclass/ingredient.cpp
+    mwclass/creaturelevlist.cpp
+    mwclass/itemlevlist.cpp
+    mwclass/light.cpp
+    mwclass/lockpick.cpp
+    mwclass/misc.cpp
+    mwclass/probe.cpp
+    mwclass/repair.cpp
+    mwclass/static.cpp
     )
 set(GAMECLASS_HEADER
     mwclass/classes.hpp
@@ -106,6 +121,21 @@ set(GAMECLASS_HEADER
     mwclass/npc.hpp
     mwclass/weapon.hpp
     mwclass/armor.hpp
+    mwclass/potion.hpp
+    mwclass/apparatus.hpp
+    mwclass/book.hpp
+    mwclass/clothing.hpp
+    mwclass/container.hpp
+    mwclass/door.hpp
+    mwclass/ingredient.hpp
+    mwclass/creaturelevlist.hpp
+    mwclass/itemlevlist.hpp
+    mwclass/light.hpp
+    mwclass/lockpick.hpp
+    mwclass/misc.hpp
+    mwclass/probe.hpp
+    mwclass/repair.hpp
+    mwclass/static.hpp
     )
 source_group(apps\\openmw\\mwclass FILES ${GAMECLASS} ${GAMECLASS_HEADER})
 

apps/openmw/mwclass/apparatus.cpp

@@ -0,0 +1,14 @@
+
+#include "apparatus.hpp"
+
+#include <components/esm/loadappa.hpp>
+
+namespace MWClass
+{
+    void Apparatus::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Apparatus);
+
+        registerClass (typeid (ESM::Apparatus).name(), instance);
+    }
+}

apps/openmw/mwclass/apparatus.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_APPARATUS_H
+#define GAME_MWCLASS_APPARATUS_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Apparatus : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/book.cpp

@@ -0,0 +1,14 @@
+
+#include "book.hpp"
+
+#include <components/esm/loadbook.hpp>
+
+namespace MWClass
+{
+    void Book::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Book);
+
+        registerClass (typeid (ESM::Book).name(), instance);
+    }
+}

apps/openmw/mwclass/book.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_BOOK_H
+#define GAME_MWCLASS_BOOK_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Book : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/classes.cpp

@@ -6,6 +6,21 @@
 #include "npc.hpp"
 #include "weapon.hpp"
 #include "armor.hpp"
+#include "potion.hpp"
+#include "apparatus.hpp"
+#include "book.hpp"
+#include "clothing.hpp"
+#include "container.hpp"
+#include "door.hpp"
+#include "ingredient.hpp"
+#include "creaturelevlist.hpp"
+#include "itemlevlist.hpp"
+#include "light.hpp"
+#include "lockpick.hpp"
+#include "misc.hpp"
+#include "probe.hpp"
+#include "repair.hpp"
+#include "static.hpp"
 
 namespace MWClass
 {
@@ -16,5 +31,20 @@ namespace MWClass
         Npc::registerSelf();
         Weapon::registerSelf();
         Armor::registerSelf();
+        Potion::registerSelf();
+        Apparatus::registerSelf();
+        Book::registerSelf();
+        Clothing::registerSelf();
+        Container::registerSelf();
+        Door::registerSelf();
+        Ingredient::registerSelf();
+        CreatureLevList::registerSelf();
+        ItemLevList::registerSelf();
+        Light::registerSelf();
+        Lockpick::registerSelf();
+        Misc::registerSelf();
+        Probe::registerSelf();
+        Repair::registerSelf();
+        Static::registerSelf();
     }
 }

apps/openmw/mwclass/clothing.cpp

@@ -0,0 +1,14 @@
+
+#include "clothing.hpp"
+
+#include <components/esm/loadclot.hpp>
+
+namespace MWClass
+{
+    void Clothing::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Clothing);
+
+        registerClass (typeid (ESM::Clothing).name(), instance);
+    }
+}

apps/openmw/mwclass/clothing.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_CLOTHING_H
+#define GAME_MWCLASS_CLOTHING_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Clothing : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/container.cpp

@@ -0,0 +1,14 @@
+
+#include "container.hpp"
+
+#include <components/esm/loadcont.hpp>
+
+namespace MWClass
+{
+    void Container::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Container);
+
+        registerClass (typeid (ESM::Container).name(), instance);
+    }
+}

apps/openmw/mwclass/container.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_CONTAINER_H
+#define GAME_MWCLASS_CONTAINER_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Container : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/creaturelevlist.cpp

@@ -0,0 +1,14 @@
+
+#include "creaturelevlist.hpp"
+
+#include <components/esm/loadlevlist.hpp>
+
+namespace MWClass
+{
+    void CreatureLevList::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new CreatureLevList);
+
+        registerClass (typeid (ESM::CreatureLevList).name(), instance);
+    }
+}

apps/openmw/mwclass/creaturelevlist.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_CREATURELEVLIST_H
+#define GAME_MWCLASS_CREATURELEVLIST_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class CreatureLevList : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/door.cpp

@@ -0,0 +1,14 @@
+
+#include "door.hpp"
+
+#include <components/esm/loaddoor.hpp>
+
+namespace MWClass
+{
+    void Door::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Door);
+
+        registerClass (typeid (ESM::Door).name(), instance);
+    }
+}

apps/openmw/mwclass/door.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_DOOR_H
+#define GAME_MWCLASS_DOOR_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Door : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/ingredient.cpp

@@ -0,0 +1,14 @@
+
+#include "ingredient.hpp"
+
+#include <components/esm/loadingr.hpp>
+
+namespace MWClass
+{
+    void Ingredient::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Ingredient);
+
+        registerClass (typeid (ESM::Ingredient).name(), instance);
+    }
+}

apps/openmw/mwclass/ingredient.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_INGREDIENT_H
+#define GAME_MWCLASS_INGREDIENT_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Ingredient : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/itemlevlist.cpp

@@ -0,0 +1,14 @@
+
+#include "itemlevlist.hpp"
+
+#include <components/esm/loadlevlist.hpp>
+
+namespace MWClass
+{
+    void ItemLevList::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new ItemLevList);
+
+        registerClass (typeid (ESM::ItemLevList).name(), instance);
+    }
+}

apps/openmw/mwclass/itemlevlist.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_ITEMLEVLIST_H
+#define GAME_MWCLASS_ITEMLEVLIST_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class ItemLevList : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/light.cpp

@@ -0,0 +1,14 @@
+
+#include "light.hpp"
+
+#include <components/esm/loadligh.hpp>
+
+namespace MWClass
+{
+    void Light::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Light);
+
+        registerClass (typeid (ESM::Light).name(), instance);
+    }
+}

apps/openmw/mwclass/light.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_LIGHT_H
+#define GAME_MWCLASS_LIGHT_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Light : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/lockpick.cpp

@@ -0,0 +1,14 @@
+
+#include "lockpick.hpp"
+
+#include <components/esm/loadlocks.hpp>
+
+namespace MWClass
+{
+    void Lockpick::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Lockpick);
+
+        registerClass (typeid (ESM::Tool).name(), instance);
+    }
+}

apps/openmw/mwclass/lockpick.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_LOCKPICK_H
+#define GAME_MWCLASS_LOCKPICK_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Lockpick : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/misc.cpp

@@ -0,0 +1,14 @@
+
+#include "misc.hpp"
+
+#include <components/esm/loadmisc.hpp>
+
+namespace MWClass
+{
+    void Misc::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Misc);
+
+        registerClass (typeid (ESM::Misc).name(), instance);
+    }
+}

apps/openmw/mwclass/misc.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_MISC_H
+#define GAME_MWCLASS_MISC_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Misc : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/potion.cpp

@@ -0,0 +1,14 @@
+
+#include "potion.hpp"
+
+#include <components/esm/loadalch.hpp>
+
+namespace MWClass
+{
+    void Potion::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Potion);
+
+        registerClass (typeid (ESM::Potion).name(), instance);
+    }
+}

apps/openmw/mwclass/potion.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_POTION_H
+#define GAME_MWCLASS_POTION_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Potion : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/probe.cpp

@@ -0,0 +1,14 @@
+
+#include "probe.hpp"
+
+#include <components/esm/loadlocks.hpp>
+
+namespace MWClass
+{
+    void Probe::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Probe);
+
+        registerClass (typeid (ESM::Probe).name(), instance);
+    }
+}

apps/openmw/mwclass/probe.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_PROBE_H
+#define GAME_MWCLASS_PROBE_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Probe : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/repair.cpp

@@ -0,0 +1,14 @@
+
+#include "repair.hpp"
+
+#include <components/esm/loadlocks.hpp>
+
+namespace MWClass
+{
+    void Repair::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Repair);
+
+        registerClass (typeid (ESM::Repair).name(), instance);
+    }
+}

apps/openmw/mwclass/repair.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_REPAIR_H
+#define GAME_MWCLASS_REPAIR_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Repair : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwclass/static.cpp

@@ -0,0 +1,14 @@
+
+#include "static.hpp"
+
+#include <components/esm/loadstat.hpp>
+
+namespace MWClass
+{
+    void Static::registerSelf()
+    {
+        boost::shared_ptr<Class> instance (new Static);
+
+        registerClass (typeid (ESM::Static).name(), instance);
+    }
+}

apps/openmw/mwclass/static.hpp

@@ -0,0 +1,17 @@
+#ifndef GAME_MWCLASS_STATIC_H
+#define GAME_MWCLASS_STATIC_H
+
+#include "../mwworld/class.hpp"
+
+namespace MWClass
+{
+    class Static : public MWWorld::Class
+    {
+        public:
+
+
+            static void registerSelf();
+    };
+}
+
+#endif

apps/openmw/mwworld/world.cpp

@@ -112,10 +112,10 @@ namespace MWWorld
         if (ESMS::LiveCellRef<ESM::NPC, RefData> *ref = cell.npcs.find (name))
             return Ptr (ref, &cell);
 
-        if (ESMS::LiveCellRef<ESM::Tool, RefData> *ref = cell.probes.find (name))
+        if (ESMS::LiveCellRef<ESM::Probe, RefData> *ref = cell.probes.find (name))
             return Ptr (ref, &cell);
 
-        if (ESMS::LiveCellRef<ESM::Tool, RefData> *ref = cell.repairs.find (name))
+        if (ESMS::LiveCellRef<ESM::Repair, RefData> *ref = cell.repairs.find (name))
             return Ptr (ref, &cell);
 
         if (ESMS::LiveCellRef<ESM::Static, RefData> *ref = cell.statics.find (name))

components/esm/loadlocks.hpp

@@ -50,5 +50,16 @@ struct Tool
     icon = esm.getHNOString("ITEX");
   }
 };
+
+struct Probe : Tool
+{
+
+};
+
+struct Repair : Tool
+{
+
+};
+
 }
 #endif

components/esm_store/cell_store.hpp

@@ -102,8 +102,8 @@ namespace ESMS
     CellRefList<Tool, D>              lockpicks;
     CellRefList<Misc, D>              miscItems;
     CellRefList<NPC, D>               npcs;
-    CellRefList<Tool, D>              probes;
+    CellRefList<Probe, D>             probes;
-    CellRefList<Tool, D>              repairs;
+    CellRefList<Repair, D>            repairs;
     CellRefList<Static, D>            statics;
     CellRefList<Weapon, D>            weapons;
 

components/esm_store/store.hpp

@@ -55,10 +55,10 @@ namespace ESMS
     RecListT<Misc>              miscItems;
     RecListT<NPC>               npcs;
     RecListT<LoadNPCC>          npcChange;
-    RecListT<Tool>              probes;
+    RecListT<Probe>             probes;
     RecListT<Race>              races;
     RecListT<Region>            regions;
-    RecListT<Tool>              repairs;
+    RecListT<Repair>            repairs;
     RecListT<SoundGenerator>    soundGens;
     RecListT<Sound>             sounds;
     RecListT<Spell>             spells;