From e6dc927f1163d3933533afaf7797a864830153ee Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 26 Nov 2013 11:49:07 +0100
Subject: [PATCH] removed duplicates of the cell name function

---
 apps/openmw/mwgui/windowmanagerimp.cpp  | 26 ++++++-------------------
 apps/openmw/mwstate/statemanagerimp.cpp | 19 +-----------------
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 83325de23..3524c6d70 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -752,29 +752,18 @@ namespace MWGui
 
     void WindowManager::changeCell(MWWorld::Ptr::CellStore* cell)
     {
+        std::string name = MWBase::Environment::get().getWorld()->getCellName (cell);
+
+        mMap->setCellName( name );
+        mHud->setCellName( name );
+
         if (cell->mCell->isExterior())
         {
-            std::string name;
-            if (cell->mCell->mName != "")
-            {
-                name = cell->mCell->mName;
+            if (!cell->mCell->mName.empty())
                 mMap->addVisitedLocation ("#{sCell=" + name + "}", cell->mCell->getGridX (), cell->mCell->getGridY ());
-            }
-            else
-            {
-                const ESM::Region* region =
-                    MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(cell->mCell->mRegion);
-                if (region)
-                    name = region->mName;
-                else
-                    name = getGameSettingString("sDefaultCellname", "Wilderness");
-            }
 
             mMap->cellExplored(cell->mCell->getGridX(), cell->mCell->getGridY());
 
-            mMap->setCellName( name );
-            mHud->setCellName( name );
-
             mMap->setCellPrefix("Cell");
             mHud->setCellPrefix("Cell");
             mMap->setActiveCell( cell->mCell->getGridX(), cell->mCell->getGridY() );
@@ -782,12 +771,9 @@ namespace MWGui
         }
         else
         {
-            mMap->setCellName( cell->mCell->mName );
-            mHud->setCellName( cell->mCell->mName );
             mMap->setCellPrefix( cell->mCell->mName );
             mHud->setCellPrefix( cell->mCell->mName );
         }
-
     }
 
     void WindowManager::setInteriorMapTexture(const int x, const int y)
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 97f8b8e55..8faab1609 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -77,24 +77,7 @@ void MWState::StateManager::saveGame (const std::string& description, const Slot
     profile.mPlayerLevel = player.getClass().getNpcStats (player).getLevel();
     profile.mPlayerClass = player.get<ESM::NPC>()->mBase->mClass;
 
-    std::string cellName;
-    if (player.getCell()->mCell->isExterior())
-    {
-        if (player.getCell()->mCell->mName != "")
-            cellName = player.getCell()->mCell->mName;
-        else
-        {
-            const ESM::Region* region =
-                MWBase::Environment::get().getWorld()->getStore().get<ESM::Region>().search(player.getCell()->mCell->mRegion);
-            if (region)
-                cellName = region->mName;
-            else
-                cellName = MWBase::Environment::get().getWindowManager()->getGameSettingString("sDefaultCellname", "Wilderness");
-        }
-    }
-    else
-        cellName = player.getCell()->mCell->mName;
-    profile.mPlayerCell = cellName;
+    profile.mPlayerCell = world.getCellName();
 
     profile.mInGameTime.mGameHour = world.getTimeStamp().getHour();
     profile.mInGameTime.mDay = world.getDay();