From ed101ad35a43e57b5bcc043e76993d1030fdd184 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Dec 2015 17:44:57 +0100
Subject: [PATCH] Remove redundant getPlayerAnimation function

---
 apps/openmw/mwrender/renderingmanager.cpp | 5 -----
 apps/openmw/mwrender/renderingmanager.hpp | 1 -
 apps/openmw/mwworld/worldimp.cpp          | 2 --
 3 files changed, 8 deletions(-)

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 775463eafa..ee9d93c0f2 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -714,11 +714,6 @@ namespace MWRender
         return mObjects->getAnimation(ptr);
     }
 
-    MWRender::Animation* RenderingManager::getPlayerAnimation()
-    {
-        return mPlayerAnimation.get();
-    }
-
     void RenderingManager::setupPlayer(const MWWorld::Ptr &player)
     {
         if (!mPlayerNode)
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index c48864e914..58012078c4 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -137,7 +137,6 @@ namespace MWRender
 
         Animation* getAnimation(const MWWorld::Ptr& ptr);
         const Animation* getAnimation(const MWWorld::ConstPtr& ptr) const;
-        Animation* getPlayerAnimation();
 
         void addWaterRippleEmitter(const MWWorld::Ptr& ptr);
         void removeWaterRippleEmitter(const MWWorld::Ptr& ptr);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2efe578a41..5da1e1a435 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2109,8 +2109,6 @@ namespace MWWorld
 
     MWRender::Animation* World::getAnimation(const MWWorld::Ptr &ptr)
     {
-        if (ptr == getPlayerPtr())
-            return mRendering->getPlayerAnimation();
         return mRendering->getAnimation(ptr);
     }