From 5e1960a76a3e8dcf63a1f12e654020364a8d3236 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 22 Mar 2021 22:29:10 +0100
Subject: [PATCH] Disallow inserting containers, creatures, and npcs from the
 save game not present in content files

---
 apps/openmw/mwworld/esmstore.cpp |  6 ++++--
 apps/openmw/mwworld/store.cpp    | 12 +++++++++---
 apps/openmw/mwworld/store.hpp    |  6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 90bc80b484..5fa4684283 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -384,12 +384,14 @@ void ESMStore::validate()
             case ESM::REC_ENCH:
             case ESM::REC_SPEL:
             case ESM::REC_WEAP:
-            case ESM::REC_NPC_:
             case ESM::REC_LEVI:
             case ESM::REC_LEVC:
+                mStores[type]->read (reader);
+                return true;
+            case ESM::REC_NPC_:
             case ESM::REC_CREA:
             case ESM::REC_CONT:
-                mStores[type]->read (reader);
+                mStores[type]->read (reader, true);
                 return true;
 
             case ESM::REC_DYNA:
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 69ca1f8c27..9d6552106b 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -250,9 +250,15 @@ namespace MWWorld
         }
     }
     template<typename T>
-    T *Store<T>::insert(const T &item)
+    T *Store<T>::insert(const T &item, bool overrideOnly)
     {
         std::string id = Misc::StringUtils::lowerCase(item.mId);
+        if(overrideOnly)
+        {
+            auto it = mStatic.find(id);
+            if(it == mStatic.end())
+                return nullptr;
+        }
         std::pair<typename Dynamic::iterator, bool> result =
             mDynamic.insert(std::pair<std::string, T>(id, item));
         T *ptr = &result.first->second;
@@ -337,13 +343,13 @@ namespace MWWorld
         }
     }
     template<typename T>
-    RecordId Store<T>::read(ESM::ESMReader& reader)
+    RecordId Store<T>::read(ESM::ESMReader& reader, bool overrideOnly)
     {
         T record;
         bool isDeleted = false;
 
         record.load (reader, isDeleted);
-        insert (record);
+        insert (record, overrideOnly);
 
         return RecordId(record.mId, isDeleted);
     }
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index cb9f4f1e02..9cb1c7473b 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -46,7 +46,7 @@ namespace MWWorld
 
         virtual void write (ESM::ESMWriter& writer, Loading::Listener& progress) const {}
 
-        virtual RecordId read (ESM::ESMReader& reader) { return RecordId(); }
+        virtual RecordId read (ESM::ESMReader& reader, bool overrideOnly = false) { return RecordId(); }
         ///< Read into dynamic storage
     };
 
@@ -192,7 +192,7 @@ namespace MWWorld
         /// @note The record identifiers are listed in the order that the records were defined by the content files.
         void listIdentifier(std::vector<std::string> &list) const override;
 
-        T *insert(const T &item);
+        T *insert(const T &item, bool overrideOnly = false);
         T *insertStatic(const T &item);
 
         bool eraseStatic(const std::string &id) override;
@@ -201,7 +201,7 @@ namespace MWWorld
 
         RecordId load(ESM::ESMReader &esm) override;
         void write(ESM::ESMWriter& writer, Loading::Listener& progress) const override;
-        RecordId read(ESM::ESMReader& reader) override;
+        RecordId read(ESM::ESMReader& reader, bool overrideOnly = false) override;
     };
 
     template <>