From 2448aa05cb56798f41b8223c105c52a15cba97fa Mon Sep 17 00:00:00 2001
From: Stanislav Bas <stanislav.m.bas@gmail.com>
Date: Sun, 12 Jul 2015 00:19:04 +0300
Subject: [PATCH] Add removing of deleted Infos to
Dialogue::clearDeletedInfos()
(cherry picked from commit adec0cb61df161e4bb25d0387d7a1ecde21363cb)
---
components/esm/loaddial.cpp | 2 +-
components/esm/loaddial.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/esm/loaddial.cpp b/components/esm/loaddial.cpp
index aeec468727..dfac0ce637 100644
--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@@ -133,7 +133,7 @@ namespace ESM
{
for (InfoContainer::iterator it = mInfo.begin(); it != mInfo.end(); )
{
- if (it->mQuestStatus == DialInfo::QS_Deleted)
+ if (it->mIsDeleted || it->mQuestStatus == DialInfo::QS_Deleted)
it = mInfo.erase(it);
else
++it;
diff --git a/components/esm/loaddial.hpp b/components/esm/loaddial.hpp
index 8fc7e14e95..e80a7b0b25 100644
--- a/components/esm/loaddial.hpp
+++ b/components/esm/loaddial.hpp
@@ -53,7 +53,7 @@ struct Dialogue
void load(ESMReader &esm);
void save(ESMWriter &esm) const;
- /// Remove all INFOs marked as QS_Deleted from mInfos.
+ /// Remove all INFOs that are deleted or marked as QS_Deleted from mInfos.
void clearDeletedInfos();
/// Read the next info record