From 377d606fc39cace8c291de001450025725479710 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Sun, 12 Jul 2015 15:20:22 +0300
Subject: [PATCH] Load/read methods in MWWorld::Store return a pair (record ID,
 deleted flag)

(cherry picked from commit c266315a355480ad6e4bc665e5d4150c6c8de8f3)

Conflicts:
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/store.hpp
---
 apps/openmw/mwworld/esmstore.cpp | 18 ++++++++----------
 components/esm/util.hpp          |  6 ------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 50a7e3376e..2a302e0825 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -95,22 +95,21 @@ void ESMStore::load(ESM::ESMReader &esm, Loading::Listener* listener)
                 throw std::runtime_error(error.str());
             }
         } else {
-            it->second->load(esm);
-            std::string id = it->second->getLastAddedRecordId();
-            if (it->second->isLastAddedRecordDeleted())
+            RecordId id = it->second->load(esm);
+            if (id.mIsDeleted)
             {
-                it->second->eraseStatic(id);
+                it->second->eraseStatic(id.mId);
                 continue;
             }
 
             if (n.val==ESM::REC_DIAL) {
-                dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id));
+                dialogue = const_cast<ESM::Dialogue*>(mDialogs.find(id.mId));
             } else {
                 dialogue = 0;
             }
             // Insert the reference into the global lookup
-            if (!id.empty() && isCacheableRecord(n.val)) {
-                mIds[Misc::StringUtils::lowerCase (id)] = n.val;
+            if (!id.mId.empty() && isCacheableRecord(n.val)) {
+                mIds[Misc::StringUtils::lowerCase (id.mId)] = n.val;
             }
         }
         listener->setProgress(static_cast<size_t>(esm.getFileOffset() / (float)esm.getFileSize() * 1000));
@@ -183,13 +182,12 @@ void ESMStore::setUp()
             case ESM::REC_LEVC:
 
                 {
-                    StoreBase *store = mStores[type];
-                    store->read (reader);
+                    RecordId id = mStores[type]->read (reader);
 
                     // FIXME: there might be stale dynamic IDs in mIds from an earlier savegame
                     // that really should be cleared instead of just overwritten
 
-                    mIds[store->getLastAddedRecordId()] = type;
+                    mIds[id.mId] = type;
                 }
 
                 if (type==ESM::REC_NPC_)
diff --git a/components/esm/util.hpp b/components/esm/util.hpp
index 258372e313..7e350808db 100644
--- a/components/esm/util.hpp
+++ b/components/esm/util.hpp
@@ -58,12 +58,6 @@ struct Vector3
 bool readDeleSubRecord(ESMReader &esm);
 void writeDeleSubRecord(ESMWriter &esm);
 
-template <class RecordT>
-std::string getRecordId(const RecordT &record)
-{
-    return record.mId;
-}
-
 template <class RecordT>
 bool isRecordDeleted(const RecordT &record)
 {