From f929004635a78804234fc5615d38ed9659c4bcbc Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 28 Jun 2014 17:44:52 +0200
Subject: [PATCH] Search exterior cells in reverse (workaround for duplicate
 chargen_plank reference in Morrowind.esm and Bloodmoon.esm)

---
 apps/openmw/mwworld/cells.cpp |  6 ++++--
 apps/openmw/mwworld/store.hpp | 21 +++++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp
index 16c1b497cd..ef3d299a92 100644
--- a/apps/openmw/mwworld/cells.cpp
+++ b/apps/openmw/mwworld/cells.cpp
@@ -193,8 +193,10 @@ MWWorld::Ptr MWWorld::Cells::getPtr (const std::string& name)
         }
 
     // Then check cells that are already listed
-    for (std::map<std::pair<int, int>, CellStore>::iterator iter = mExteriors.begin();
-        iter!=mExteriors.end(); ++iter)
+    // Search in reverse, this is a workaround for an ambiguous chargen_plank reference in the vanilla game.
+    // there is one at -22,16 and one at -2,-9, the latter should be used.
+    for (std::map<std::pair<int, int>, CellStore>::reverse_iterator iter = mExteriors.rbegin();
+        iter!=mExteriors.rend(); ++iter)
     {
         Ptr ptr = getPtrAndCache (name, iter->second);
         if (!ptr.isEmpty())
diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index a04267f499..3e7e7a5f98 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -552,23 +552,16 @@ namespace MWWorld
     template <>
     class Store<ESM::Cell> : public StoreBase
     {
-        struct ExtCmp
-        {
-            bool operator()(const ESM::Cell &x, const ESM::Cell &y) {
-                if (x.mData.mX == y.mData.mX) {
-                    return x.mData.mY < y.mData.mY;
-                }
-                return x.mData.mX < y.mData.mX;
-            }
-        };
-
         struct DynamicExtCmp
         {
             bool operator()(const std::pair<int, int> &left, const std::pair<int, int> &right) const {
-                if (left.first == right.first) {
-                    return left.second < right.second;
-                }
-                return left.first < right.first;
+                if (left.first == right.first && left.second == right.second)
+                    return false;
+
+                if (left.first == right.first)
+                    return left.second > right.second;
+
+                return left.first > right.first;
             }
         };