From 9a1b5dc1c64d54f64694eba5f9c21cf0e7dfcd25 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 29 Apr 2014 15:32:00 +0200
Subject: [PATCH] a bit of cleanup

---
 apps/openmw/mwworld/scene.cpp    | 10 ++++++++++
 apps/openmw/mwworld/scene.hpp    |  2 ++
 apps/openmw/mwworld/worldimp.cpp | 11 +----------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index 9d456e236..b277b2494 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -497,6 +497,16 @@ namespace MWWorld
         return false;
     }
 
+    Ptr Scene::searchPtrViaHandle (const std::string& handle)
+    {
+        for (CellStoreCollection::const_iterator iter (mActiveCells.begin());
+            iter!=mActiveCells.end(); ++iter)
+            if (Ptr ptr = (*iter)->searchViaHandle (handle))
+                return ptr;
+
+        return Ptr();
+    }
+
     Ptr Scene::searchPtrViaActorId (int actorId)
     {
         for (CellStoreCollection::const_iterator iter (mActiveCells.begin());
diff --git a/apps/openmw/mwworld/scene.hpp b/apps/openmw/mwworld/scene.hpp
index b85a3d7ce..a26ad99de 100644
--- a/apps/openmw/mwworld/scene.hpp
+++ b/apps/openmw/mwworld/scene.hpp
@@ -103,6 +103,8 @@ namespace MWWorld
 
             bool isCellActive(const CellStore &cell);
 
+            Ptr searchPtrViaHandle (const std::string& handle);
+
             Ptr searchPtrViaActorId (int actorId);
     };
 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 79c8b38f3..6fa182894 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -536,17 +536,8 @@ namespace MWWorld
     {
         if (mPlayer->getPlayer().getRefData().getHandle()==handle)
             return mPlayer->getPlayer();
-        for (Scene::CellStoreCollection::const_iterator iter (mWorldScene->getActiveCells().begin());
-            iter!=mWorldScene->getActiveCells().end(); ++iter)
-        {
-            CellStore* cellstore = *iter;
-            Ptr ptr = cellstore->searchViaHandle (handle);
-
-            if (!ptr.isEmpty())
-                return ptr;
-        }
 
-        return MWWorld::Ptr();
+        return mWorldScene->searchPtrViaHandle (handle);
     }
 
     Ptr World::searchPtrViaActorId (int actorId)