From 141382b8c0b879803bffa0e41f54556b2f9f3d6c Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Sat, 12 Oct 2013 14:48:37 -0500
Subject: [PATCH] COC Command:  Exterior cell selection fix.

Return the northernmost cell of the easternmost matching column for Ext. cells.
---
 apps/openmw/mwworld/store.hpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwworld/store.hpp b/apps/openmw/mwworld/store.hpp
index 2ee23dbd6..90452f661 100644
--- a/apps/openmw/mwworld/store.hpp
+++ b/apps/openmw/mwworld/store.hpp
@@ -656,26 +656,38 @@ namespace MWWorld
             return iterator(mSharedExt.end());
         }
 
-        /// \todo implement appropriate index
+        // Return the northernmost cell in the easternmost column.
         const ESM::Cell *searchExtByName(const std::string &id) const {
+            ESM::Cell *cell = 0;
             std::vector<ESM::Cell *>::const_iterator it = mSharedExt.begin();
             for (; it != mSharedExt.end(); ++it) {
                 if (Misc::StringUtils::ciEqual((*it)->mName, id)) {
-                    return *it;
+                    if ( cell == 0 ||
+                        ( (*it)->mData.mX > cell->mData.mX ) ||
+                        ( (*it)->mData.mX == cell->mData.mX && (*it)->mData.mY > cell->mData.mY ) )
+                    {
+                        cell = *it;
+                    }
                 }
             }
-            return 0;
+            return cell;
         }
 
-        /// \todo implement appropriate index
+        // Return the northernmost cell in the easternmost column.
         const ESM::Cell *searchExtByRegion(const std::string &id) const {
+            ESM::Cell *cell = 0;
             std::vector<ESM::Cell *>::const_iterator it = mSharedExt.begin();
             for (; it != mSharedExt.end(); ++it) {
                 if (Misc::StringUtils::ciEqual((*it)->mRegion, id)) {
-                    return *it;
+                    if ( cell == 0 ||
+                        ( (*it)->mData.mX > cell->mData.mX ) ||
+                        ( (*it)->mData.mX == cell->mData.mX && (*it)->mData.mY > cell->mData.mY ) )
+                    {
+                        cell = *it;
+                    }
                 }
             }
-            return 0;
+            return cell;
         }
 
         size_t getSize() const {