From e0983c815c32c9b79d340100ab2b4b6750820554 Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Sat, 11 Jul 2015 22:17:53 +0300
Subject: [PATCH] Some fixes for ESM Dialogues and Infos

---
 apps/openmw/mwworld/store.hpp | 3 ++-
 components/esm/loaddial.cpp   | 2 ++
 components/esm/loaddial.hpp   | 3 ++-
 components/esm/loadinfo.cpp   | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index c482486d8..ff0ca0159 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -371,7 +371,8 @@ namespace MWWorld
         }
         else
         {
-            found->second = dialogue;
+            found->second.mIsDeleted = dialogue.mIsDeleted;
+            found->second.mType = dialogue.mType;
         }
         
         mLastAddedRecord = dialogue;
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index 667afc75c..aeec46872 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -32,6 +32,7 @@ namespace ESM
             int32_t empty;
             esm.getT(empty); // Skip an empty DATA
             mIsDeleted = readDeleSubRecord(esm);
+            mType = Unknown;
         }
         else
             esm.fail("Unknown sub record size");
@@ -54,6 +55,7 @@ namespace ESM
     void Dialogue::blank()
     {
         mInfo.clear();
+        mIsDeleted = false;
     }
 
     void Dialogue::readInfo(ESMReader &esm, bool merge)
diff --git a/components/esm/loaddial.hpp b/components/esm/loaddial.hpp
index 5e7d09871..8fc7e14e9 100644
--- a/components/esm/loaddial.hpp
+++ b/components/esm/loaddial.hpp
@@ -30,7 +30,8 @@ struct Dialogue
         Voice = 1,
         Greeting = 2,
         Persuasion = 3,
-        Journal = 4
+        Journal = 4,
+        Unknown = -1 // Used for deleted dialogues
     };
 
     std::string mId;
diff --git a/components/esm/loadinfo.cpp b/components/esm/loadinfo.cpp
index 4c997213a..c1b12e24c 100644
--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@@ -17,6 +17,7 @@ namespace ESM
     {
         mQuestStatus = QS_None;
         mFactionLess = false;
+        mIsDeleted = false;
 
         mPrev = esm.getHNString("PNAM");
         mNext = esm.getHNString("NNAM");
@@ -142,6 +143,7 @@ namespace ESM
     {
         esm.writeHNCString("PNAM", mPrev);
         esm.writeHNCString("NNAM", mNext);
+
         if (mIsDeleted)
         {
             esm.writeHNCString("NAME", mResponse);
@@ -200,5 +202,6 @@ namespace ESM
         mResultScript.clear();
         mFactionLess = false;
         mQuestStatus = QS_None;
+        mIsDeleted = false;
     }
 }