From 9a803739ff21ed67f49ae28373244c32fb0d7fc8 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Sat, 18 Jul 2015 15:55:24 +0300
Subject: [PATCH] Add a separate method to check whether a record is deleted or
 not for IdCollection

(cherry picked from commit a4d3e59e5c7380ffb27b4d17d4574009e2b45379)
---
 apps/opencs/model/world/idcollection.cpp |  3 +++
 apps/opencs/model/world/idcollection.hpp |  4 ++--
 apps/opencs/model/world/land.hpp         | 10 ----------
 apps/opencs/model/world/pathgrid.hpp     | 10 ----------
 apps/opencs/model/world/record.cpp       | 24 ++++++++++++++++++++++++
 apps/opencs/model/world/record.hpp       | 23 +++++++++++++++++++++++
 6 files changed, 52 insertions(+), 22 deletions(-)
 create mode 100644 apps/opencs/model/world/idcollection.cpp

diff --git a/apps/opencs/model/world/idcollection.cpp b/apps/opencs/model/world/idcollection.cpp
new file mode 100644
index 000000000..9571ed773
--- /dev/null
+++ b/apps/opencs/model/world/idcollection.cpp
@@ -0,0 +1,3 @@
+#include "idcollection.hpp"
+
+
diff --git a/apps/opencs/model/world/idcollection.hpp b/apps/opencs/model/world/idcollection.hpp
index d08abce5b..4acfdc474 100644
--- a/apps/opencs/model/world/idcollection.hpp
+++ b/apps/opencs/model/world/idcollection.hpp
@@ -2,9 +2,9 @@
 #define CSM_WOLRD_IDCOLLECTION_H
 
 #include <components/esm/esmreader.hpp>
-#include <components/esm/util.hpp>
 
 #include "collection.hpp"
+#include "record.hpp"
 
 namespace CSMWorld
 {
@@ -48,7 +48,7 @@ namespace CSMWorld
         std::string id = IdAccessorT().getId (record);
         int index = searchId (id);
 
-        if (ESM::isRecordDeleted (record))
+        if (isRecordDeleted(record))
         {
             if (index==-1)
             {
diff --git a/apps/opencs/model/world/land.hpp b/apps/opencs/model/world/land.hpp
index 1b79913be..22cedb56d 100644
--- a/apps/opencs/model/world/land.hpp
+++ b/apps/opencs/model/world/land.hpp
@@ -4,7 +4,6 @@
 #include <string>
 
 #include <components/esm/loadland.hpp>
-#include <components/esm/util.hpp>
 
 namespace CSMWorld
 {
@@ -21,13 +20,4 @@ namespace CSMWorld
     };
 }
 
-namespace ESM
-{
-    template <>
-    bool isRecordDeleted<CSMWorld::Land>(const CSMWorld::Land &land)
-    {
-        return false;
-    }
-}
-
 #endif
diff --git a/apps/opencs/model/world/pathgrid.hpp b/apps/opencs/model/world/pathgrid.hpp
index cd5e472c8..7e7b7c3bb 100644
--- a/apps/opencs/model/world/pathgrid.hpp
+++ b/apps/opencs/model/world/pathgrid.hpp
@@ -5,7 +5,6 @@
 #include <string>
 
 #include <components/esm/loadpgrd.hpp>
-#include <components/esm/util.hpp>
 
 namespace CSMWorld
 {
@@ -27,13 +26,4 @@ namespace CSMWorld
     };
 }
 
-namespace ESM
-{
-    template <>
-    bool isRecordDeleted<CSMWorld::Pathgrid>(const CSMWorld::Pathgrid &pgrd)
-    {
-        return false;
-    }
-}
-
 #endif
diff --git a/apps/opencs/model/world/record.cpp b/apps/opencs/model/world/record.cpp
index f13a36afc..08a2f5ab2 100644
--- a/apps/opencs/model/world/record.cpp
+++ b/apps/opencs/model/world/record.cpp
@@ -18,3 +18,27 @@ bool CSMWorld::RecordBase::isModified() const
 {
     return mState==State_Modified || mState==State_ModifiedOnly;
 }
+
+template<>
+bool CSMWorld::isRecordDeleted(const CSMWorld::Land &land)
+{
+    return land.mLand->mIsDeleted;
+}
+
+template<>
+bool CSMWorld::isRecordDeleted(const ESM::GameSetting &setting)
+{
+    return false;
+}
+
+template<>
+bool CSMWorld::isRecordDeleted(const ESM::MagicEffect &effect)
+{
+    return false;
+}
+
+template<>
+bool CSMWorld::isRecordDeleted(const ESM::Skill &skill)
+{
+    return false;
+}
diff --git a/apps/opencs/model/world/record.hpp b/apps/opencs/model/world/record.hpp
index 3362f9f96..c43a8b6ca 100644
--- a/apps/opencs/model/world/record.hpp
+++ b/apps/opencs/model/world/record.hpp
@@ -3,6 +3,12 @@
 
 #include <stdexcept>
 
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadmgef.hpp>
+#include <components/esm/loadskil.hpp>
+
+#include "land.hpp"
+
 namespace CSMWorld
 {
     struct RecordBase
@@ -154,6 +160,23 @@ namespace CSMWorld
             mState = State_Erased;
         }
     }
+
+    // Not all records can be deleted (may be changed in the future), 
+    // so we need to use a separate method to check whether a record is deleted or not.
+    template<typename ESXRecordT>
+    bool isRecordDeleted(const ESXRecordT &record)
+    {
+        return record.mIsDeleted;
+    }
+
+    template<>
+    bool isRecordDeleted(const Land &land);
+    template<>
+    bool isRecordDeleted(const ESM::GameSetting &setting);
+    template<>
+    bool isRecordDeleted(const ESM::MagicEffect &effect);
+    template<>
+    bool isRecordDeleted(const ESM::Skill &skill);
 }
 
 #endif