save and load dynamic records

apps/openmw/mwbase/mechanicsmanager.hpp

@@ -123,6 +123,8 @@ namespace MWBase
 
             virtual void toggleAI() = 0;
             virtual bool isAIActive() = 0;
+
+            virtual void playerLoaded() = 0;
     };
 }
 

apps/openmw/mwbase/world.hpp

@@ -30,6 +30,7 @@ namespace OEngine
 namespace ESM
 {
     class ESMReader;
+    class ESMWriter;
     struct Position;
     struct Cell;
     struct Class;
@@ -98,6 +99,12 @@ namespace MWBase
 
             virtual void clear() = 0;
 
+            virtual int countSavedGameRecords() const = 0;
+
+            virtual void write (ESM::ESMWriter& writer) const = 0;
+
+            virtual void readRecord (ESM::ESMReader& reader, int32_t type) = 0;
+
             virtual OEngine::Render::Fader* getFader() = 0;
             ///< \ŧodo remove this function. Rendering details should not be exposed.
 

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

@@ -701,4 +701,12 @@ namespace MWMechanics
     {
         return mAI;
     }
+
+    void MechanicsManager::playerLoaded()
+    {
+        mUpdatePlayer = true;
+        mClassSelected = true;
+        mRaceSelected = true;
+        mAI = true;
+    }
 }

apps/openmw/mwmechanics/mechanicsmanagerimp.hpp

@@ -110,6 +110,8 @@ namespace MWMechanics
 
             virtual void toggleAI();
             virtual bool isAIActive();
+
+            virtual void playerLoaded();
     };
 }
 

apps/openmw/mwstate/statemanagerimp.cpp

@@ -11,6 +11,7 @@
 #include "../mwbase/journal.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
@@ -103,8 +104,10 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     ESM::ESMWriter writer;
     writer.setFormat (ESM::Header::CurrentFormat);
     writer.setRecordCount (
-        1+ // saved game header
+        1 // saved game header
-        MWBase::Environment::get().getJournal()->countSavedGameRecords());
+        +MWBase::Environment::get().getJournal()->countSavedGameRecords()
+        +MWBase::Environment::get().getWorld()->countSavedGameRecords()
+        );
 
     writer.save (stream);
 
@@ -113,7 +116,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     writer.endRecord (ESM::REC_SAVE);
 
     MWBase::Environment::get().getJournal()->write (writer);
-    /// \todo write saved game data
+    MWBase::Environment::get().getWorld()->write (writer);
 
     writer.close();
 
@@ -149,6 +152,19 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
                 MWBase::Environment::get().getJournal()->readRecord (reader, n.val);
                 break;
 
+            case ESM::REC_ALCH:
+            case ESM::REC_ARMO:
+            case ESM::REC_BOOK:
+            case ESM::REC_CLAS:
+            case ESM::REC_CLOT:
+            case ESM::REC_ENCH:
+            case ESM::REC_NPC_:
+            case ESM::REC_SPEL:
+            case ESM::REC_WEAP:
+
+                MWBase::Environment::get().getWorld()->readRecord (reader, n.val);
+                break;
+
             default:
 
                 // ignore invalid records
@@ -167,6 +183,13 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
     MWBase::Environment::get().getWorld()->setupPlayer();
     MWBase::Environment::get().getWorld()->renderPlayer();
     MWBase::Environment::get().getWindowManager()->updatePlayer();
+    MWBase::Environment::get().getMechanicsManager()->playerLoaded();
+
+    // for testing purpose only
+    ESM::Position pos;
+    pos.pos[0] = pos.pos[1] = pos.pos[2] = 0;
+    pos.rot[0] = pos.rot[1] = pos.rot[2] = 0;
+    MWBase::Environment::get().getWorld()->changeToExteriorCell (pos);
 }
 
 MWState::Character *MWState::StateManager::getCurrentCharacter (bool create)

apps/openmw/mwworld/esmstore.cpp

@@ -139,4 +139,54 @@ void ESMStore::setUp()
     mAttributes.setUp();
 }
 
+    int ESMStore::countSavedGameRecords() const
+    {
+        return
+            mPotions.getDynamicSize()
+            +mArmors.getDynamicSize()
+            +mBooks.getDynamicSize()
+            +mClasses.getDynamicSize()
+            +mClothes.getDynamicSize()
+            +mEnchants.getDynamicSize()
+            +mNpcs.getDynamicSize()
+            +mSpells.getDynamicSize()
+            +mWeapons.getDynamicSize();
+    }
+
+    void ESMStore::write (ESM::ESMWriter& writer) const
+    {
+        mPotions.write (writer);
+        mArmors.write (writer);
+        mBooks.write (writer);
+        mClasses.write (writer);
+        mClothes.write (writer);
+        mEnchants.write (writer);
+        mNpcs.write (writer);
+        mSpells.write (writer);
+        mWeapons.write (writer);
+    }
+
+    bool ESMStore::readRecord (ESM::ESMReader& reader, int32_t type)
+    {
+        switch (type)
+        {
+            case ESM::REC_ALCH:
+            case ESM::REC_ARMO:
+            case ESM::REC_BOOK:
+            case ESM::REC_CLAS:
+            case ESM::REC_CLOT:
+            case ESM::REC_ENCH:
+            case ESM::REC_NPC_:
+            case ESM::REC_SPEL:
+            case ESM::REC_WEAP:
+
+                mStores[type]->read (reader);
+                return true;
+
+            default:
+
+                return false;
+        }
+    }
+
 } // end namespace

apps/openmw/mwworld/esmstore.hpp

@@ -209,6 +209,13 @@ namespace MWWorld
         // This method must be called once, after loading all master/plugin files. This can only be done
         //  from the outside, so it must be public.
         void setUp();
+
+        int countSavedGameRecords() const;
+
+        void write (ESM::ESMWriter& writer) const;
+
+        bool readRecord (ESM::ESMReader& reader, int32_t type);
+        ///< \return Known type?
     };
 
     template <>

apps/openmw/mwworld/store.hpp

@@ -6,6 +6,8 @@
 #include <map>
 #include <stdexcept>
 
+#include <components/esm/esmwriter.hpp>
+
 #include "recordcmp.hpp"
 
 namespace MWWorld
@@ -18,10 +20,16 @@ namespace MWWorld
         virtual void listIdentifier(std::vector<std::string> &list) const {}
 
         virtual size_t getSize() const = 0;
+        virtual int getDynamicSize() const { return 0; }
         virtual void load(ESM::ESMReader &esm, const std::string &id) = 0;
 
         virtual bool eraseStatic(const std::string &id) {return false;}
         virtual void clearDynamic() {}
+
+        virtual void write (ESM::ESMWriter& writer) const {}
+
+        virtual void read (ESM::ESMReader& reader) {}
+        ///< Read into dynamic storage
     };
 
     template <class T>
@@ -212,6 +220,11 @@ namespace MWWorld
             return mShared.size();
         }
 
+        int getDynamicSize() const
+        {
+            return mDynamic.size();
+        }
+
         void listIdentifier(std::vector<std::string> &list) const {
             list.reserve(list.size() + getSize());
             typename std::vector<T *>::const_iterator it = mShared.begin();
@@ -290,6 +303,26 @@ namespace MWWorld
         bool erase(const T &item) {
             return erase(item.mId);
         }
+
+        void write (ESM::ESMWriter& writer) const
+        {
+            for (typename Dynamic::const_iterator iter (mDynamic.begin()); iter!=mDynamic.end();
+                 ++iter)
+            {
+                writer.startRecord (T::sRecordId);
+                writer.writeHNString ("NAME", iter->second.mId);
+                iter->second.save (writer);
+                writer.endRecord (T::sRecordId);
+            }
+        }
+
+        void read (ESM::ESMReader& reader)
+        {
+            T record;
+            record.mId = reader.getHNString ("NAME");
+            record.load (reader);
+            insert (record);
+        }
     };
 
     template <>

apps/openmw/mwworld/worldimp.cpp

@@ -282,7 +282,10 @@ namespace MWWorld
         mWorldScene->changeToVoid();
 
         if (mPlayer)
+        {
+            mPlayer->setCell (0);
             mPlayer->getPlayer().getRefData() = RefData();
+        }
 
         mStore.clearDynamic();
         mStore.setUp();
@@ -299,6 +302,25 @@ namespace MWWorld
         mFacedDistance = FLT_MAX;
     }
 
+    int World::countSavedGameRecords() const
+    {
+        return mStore.countSavedGameRecords();
+    }
+
+    void World::write (ESM::ESMWriter& writer) const
+    {
+        mStore.write (writer);
+    }
+
+    void World::readRecord (ESM::ESMReader& reader, int32_t type)
+    {
+        if (!mStore.readRecord (reader, type))
+        {
+            /// \todo handle other world state records
+
+        }
+    }
+
     void World::ensureNeededRecords()
     {
         if (!mStore.get<ESM::GameSetting>().search("sCompanionShare"))

apps/openmw/mwworld/worldimp.hpp

@@ -171,6 +171,12 @@ namespace MWWorld
 
             virtual void clear();
 
+            virtual int countSavedGameRecords() const;
+
+            virtual void write (ESM::ESMWriter& writer) const;
+
+            virtual void readRecord (ESM::ESMReader& reader, int32_t type);
+
             virtual OEngine::Render::Fader* getFader();
             ///< \ŧodo remove this function. Rendering details should not be exposed.