From 1dd36329a34e1cf2d5b7412472d5a83f6907d98d Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Thu, 3 May 2018 10:37:55 +0400
Subject: [PATCH] Load default markers definitions (bug #4410)

---
 apps/openmw/mwworld/esmstore.cpp |  1 +
 apps/openmw/mwworld/store.cpp    | 28 ++++++++++++++++++++++++++++
 components/esm/loadstat.hpp      | 16 +++++++++++++---
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 4a1763d0a..2fe9ebcad 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -141,6 +141,7 @@ void ESMStore::setUp()
     mMagicEffects.setUp();
     mAttributes.setUp();
     mDialogs.setUp();
+    mStatics.setUp();
 }
 
     int ESMStore::countSavedGameRecords() const
diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 158d3f771..e9968c38f 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -1053,6 +1053,34 @@ namespace MWWorld
         }
     }
 
+    template<>
+    void Store<ESM::Static>::setUp()
+    {
+        // Load default marker definitions, if game files do not have them for some reason
+        std::pair<std::string, std::string> markers[] = {
+            std::make_pair("divinemarker", "marker_divine.nif"),
+            std::make_pair("doormarker", "marker_arrow.nif"),
+            std::make_pair("northmarker", "marker_north.nif"),
+            std::make_pair("templemarker", "marker_temple.nif"),
+            std::make_pair("travelmarker", "marker_travel.nif")
+        };
+
+        for (const std::pair<std::string, std::string> marker : markers)
+        {
+            if (search(marker.first) == 0)
+            {
+                ESM::Static newMarker = ESM::Static(marker.first, marker.second);
+                mStatic.insert(std::make_pair(marker.first, newMarker));
+
+                std::map<std::string, ESM::Static>::iterator found = mStatic.find(marker.first);
+                if (found != mStatic.end())
+                {
+                    mShared.push_back(&found->second);
+                }
+            }
+        }
+    }
+
     template <>
     inline RecordId Store<ESM::Dialogue>::load(ESM::ESMReader &esm) {
         // The original letter case of a dialogue ID is saved, because it's printed
diff --git a/components/esm/loadstat.hpp b/components/esm/loadstat.hpp
index 930cdb849..f80875b65 100644
--- a/components/esm/loadstat.hpp
+++ b/components/esm/loadstat.hpp
@@ -26,13 +26,23 @@ struct Static
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string getRecordType() { return "Static"; }
 
-  std::string mId, mModel;
+    std::string mId, mModel;
 
-  void load(ESMReader &esm, bool &isDeleted);
-  void save(ESMWriter &esm, bool isDeleted = false) const;
+    void load(ESMReader &esm, bool &isDeleted);
+    void save(ESMWriter &esm, bool isDeleted = false) const;
 
     void blank();
     ///< Set record to default state (does not touch the ID).
+
+    Static(const std::string id, const std::string &model)
+    : mId(id)
+    , mModel(model)
+    {
+    }
+
+    Static()
+    {
+    }
 };
 }
 #endif