From 19325f9d40944df8c6b312d309469e59e3c6c520 Mon Sep 17 00:00:00 2001
From: Nathan Jeffords <blunted2night@gmail.com>
Date: Sun, 21 Apr 2013 11:41:09 -0700
Subject: [PATCH 1/4] fixed the type of iterator uses in MWWorld::Store

The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
---
 apps/openmw/mwworld/store.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index fb3f8c4826..2bd61c2b02 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -475,7 +475,7 @@ namespace MWWorld
             cell.mData.mX = x, cell.mData.mY = y;
 
             std::pair<int, int> key(x, y);
-            std::map<std::pair<int, int>, ESM::Cell>::const_iterator it = mExt.find(key);
+            DynamicExt::const_iterator it = mExt.find(key);
             if (it != mExt.end()) {
                 return &(it->second);
             }
@@ -493,7 +493,7 @@ namespace MWWorld
             cell.mData.mX = x, cell.mData.mY = y;
 
             std::pair<int, int> key(x, y);
-            std::map<std::pair<int, int>, ESM::Cell>::const_iterator it = mExt.find(key);
+            DynamicExt::const_iterator it = mExt.find(key);
             if (it != mExt.end()) {
                 return &(it->second);
             }
@@ -534,7 +534,7 @@ namespace MWWorld
 
         void setUp() {
             //typedef std::vector<ESM::Cell>::iterator Iterator;
-            typedef std::map<std::pair<int, int>, ESM::Cell>::iterator ExtIterator;
+            typedef DynamicExt::iterator ExtIterator;
             typedef std::map<std::string, ESM::Cell>::iterator IntIterator;
 
             //std::sort(mInt.begin(), mInt.end(), RecordCmp());

From 8bf1149cec0da1e8f7c59089c01b8804c9897cf9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 21 Apr 2013 21:24:48 +0200
Subject: [PATCH 2/4] Fix activation not working sometimes

The current player cell was only being updated when the reference was not empty, causing it
to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.
---
 apps/openmw/mwgui/referenceinterface.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/referenceinterface.cpp b/apps/openmw/mwgui/referenceinterface.cpp
index 66e036d929..86a85be18e 100644
--- a/apps/openmw/mwgui/referenceinterface.cpp
+++ b/apps/openmw/mwgui/referenceinterface.cpp
@@ -18,17 +18,17 @@ namespace MWGui
 
     void ReferenceInterface::checkReferenceAvailable()
     {
-        if (mPtr.isEmpty())
-            return;
-
         MWWorld::Ptr::CellStore* playerCell = MWBase::Environment::get().getWorld()->getPlayer().getPlayer().getCell();
 
         // check if player has changed cell, or count of the reference has become 0
         if ((playerCell != mCurrentPlayerCell && mCurrentPlayerCell != NULL)
-            || mPtr.getRefData().getCount() == 0)
+             || (!mPtr.isEmpty() && mPtr.getRefData().getCount() == 0))
         {
-            mPtr = MWWorld::Ptr();
-            onReferenceUnavailable();
+            if (!mPtr.isEmpty())
+            {
+                mPtr = MWWorld::Ptr();
+                onReferenceUnavailable();
+            }
         }
 
         mCurrentPlayerCell = playerCell;

From 56b871e362724008c8bd4c5a686f63ce730f2a36 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 22 Apr 2013 07:57:53 +0200
Subject: [PATCH 3/4] Rank condition should always fail if NPC is not in a
 faction

---
 apps/openmw/mwdialogue/filter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 78969ffd0b..52c7bd4f34 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -73,6 +73,11 @@ bool MWDialogue::Filter::testActor (const ESM::DialInfo& info) const
         if (iter->second < info.mData.mRank)
             return false;
     }
+    else if (info.mData.mRank != -1)
+    {
+        // if there is a rank condition, but the NPC is not in a faction, always fail
+        return false;
+    }
 
     // Gender
     if (!isCreature)

From a608e7ed06883ebc2b0ae09702bc133ffc2b1095 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 22 Apr 2013 09:56:11 +0200
Subject: [PATCH 4/4] updated changelog once more

---
 readme.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.txt b/readme.txt
index d5a5dcc183..c033f95475 100644
--- a/readme.txt
+++ b/readme.txt
@@ -137,6 +137,8 @@ Bug #702: Some race mods don't work
 Bug #711: Crash during character creation
 Bug #715: Growing Tauryon
 Bug #725: Auto calculate stats
+Bug #728: Failure to open container and talk dialogue
+Bug #731: Crash with Mush-Mere's "background" topic
 Feature #55/657: Item Repairing
 Feature #62/87: Enchanting
 Feature #99: Pathfinding