From bc6fe682c91c81ab0080ca85041f34c90e4c7eb4 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 26 Nov 2013 11:39:58 +0100
Subject: [PATCH] replaced getCurrentCellName function with a more general
 getCellName function

---
 apps/openmw/mwbase/world.hpp                |  6 +++-
 apps/openmw/mwscript/interpretercontext.cpp |  3 +-
 apps/openmw/mwworld/worldimp.cpp            | 38 +++++----------------
 apps/openmw/mwworld/worldimp.hpp            |  6 +++-
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index fe7d8f7ac..37d3c10da 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -149,7 +149,11 @@ namespace MWBase
 
             virtual std::vector<std::string> getGlobals () const = 0;
 
-            virtual std::string getCurrentCellName() const = 0;
+            virtual std::string getCellName (const MWWorld::CellStore *cell = 0) const = 0;
+            ///< Return name of the cell.
+            ///
+            /// \note If cell==0, the cell the player is currently in will be used instead to
+            /// generate a name.
 
             virtual void removeRefScript (MWWorld::RefData *ref) = 0;
             //< Remove the script attached to ref from mLocalScripts
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index b8fc9ed47..5639ea208 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -322,8 +322,7 @@ namespace MWScript
 
     std::string InterpreterContext::getCurrentCellName() const
     {
-        MWBase::World *world = MWBase::Environment::get().getWorld();
-        return world->getCurrentCellName();
+        return  MWBase::Environment::get().getWorld()->getCellName();
     }
 
     bool InterpreterContext::isScriptRunning (const std::string& name) const
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5a4192529..7d2da389c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -442,40 +442,20 @@ namespace MWWorld
         return mGlobalVariables->getGlobals();
     }
 
-    std::string World::getCurrentCellName () const
+    std::string World::getCellName (const MWWorld::CellStore *cell) const
     {
-        std::string name;
+        if (!cell)
+            cell = mWorldScene->getCurrentCell();
 
-        Ptr::CellStore *cell = mWorldScene->getCurrentCell();
-        if (cell->mCell->isExterior())
-        {
-            if (cell->mCell->mName != "")
-            {
-                name = cell->mCell->mName;
-            }
-            else
-            {
-                const ESM::Region* region =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(cell->mCell->mRegion);
-                if (region)
-                    name = region->mName;
-                else
-                {
-                    const ESM::GameSetting *setting =
-                        MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().search("sDefaultCellname");
+        if (!cell->mCell->isExterior() || !cell->mCell->mName.empty())
+            return cell->mCell->mName;
 
-                    if (setting && setting->mValue.getType()==ESM::VT_String)
-                        name = setting->mValue.getString();
-                }
+        const MWWorld::ESMStore& store = MWBase::Environment::get().getWorld()->getStore();
 
-            }
-        }
-        else
-        {
-            name = cell->mCell->mName;
-        }
+        if (const ESM::Region* region = store.get<ESM::Region>().search (cell->mCell->mRegion))
+            return region->mName;
 
-        return name;
+        return store.get<ESM::GameSetting>().find ("sDefaultCellname")->mValue.getString();
     }
 
     void World::removeRefScript (MWWorld::RefData *ref)
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 32ad84865..33f6f1c2f 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -213,7 +213,11 @@ namespace MWWorld
 
             virtual std::vector<std::string> getGlobals () const;
 
-            virtual std::string getCurrentCellName () const;
+            virtual std::string getCellName (const MWWorld::CellStore *cell = 0) const;
+            ///< Return name of the cell.
+            ///
+            /// \note If cell==0, the cell the player is currently in will be used instead to
+            /// generate a name.
 
             virtual void removeRefScript (MWWorld::RefData *ref);
             //< Remove the script attached to ref from mLocalScripts