From f7befa3e54a2c1965169b7303153623412a9a81f Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 15 Nov 2013 02:20:04 +0100 Subject: [PATCH] Remove a no longer required method --- apps/openmw/mwbase/world.hpp | 2 -- apps/openmw/mwrender/renderingmanager.cpp | 14 -------------- apps/openmw/mwrender/renderingmanager.hpp | 3 --- apps/openmw/mwworld/worldimp.cpp | 6 ------ apps/openmw/mwworld/worldimp.hpp | 2 -- 5 files changed, 27 deletions(-) diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp index ad3130ac5d..e1adfbec46 100644 --- a/apps/openmw/mwbase/world.hpp +++ b/apps/openmw/mwbase/world.hpp @@ -414,8 +414,6 @@ namespace MWBase virtual void castSpell (const MWWorld::Ptr& actor) = 0; - virtual void updateAnimParts(const MWWorld::Ptr& ptr) = 0; - virtual void launchProjectile (const std::string& id, const ESM::EffectList& effects, const MWWorld::Ptr& actor, const std::string& sourceName) = 0; }; diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 531e64629e..57e00d76c7 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -327,20 +327,6 @@ void RenderingManager::rebuildPtr(const MWWorld::Ptr &ptr) } } -void RenderingManager::updateAnimParts(const MWWorld::Ptr& ptr) -{ - NpcAnimation *anim = NULL; - - if(ptr.getRefData().getHandle() == "player") - anim = mPlayerAnimation; - else if(MWWorld::Class::get(ptr).isActor()) - anim = dynamic_cast(mActors.getAnimation(ptr)); - - assert(anim); - if(anim) - anim->updateParts(); -} - void RenderingManager::update (float duration, bool paused) { MWBase::World *world = MWBase::Environment::get().getWorld(); diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp index 8913e0a789..2d08139128 100644 --- a/apps/openmw/mwrender/renderingmanager.hpp +++ b/apps/openmw/mwrender/renderingmanager.hpp @@ -141,9 +141,6 @@ public: /// and equipment. void rebuildPtr(const MWWorld::Ptr &ptr); - /// Update actor model parts. - void updateAnimParts(const MWWorld::Ptr &ptr); - void update (float duration, bool paused); void setAmbientColour(const Ogre::ColourValue& colour); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 13b8bd79ba..eca2ebb79f 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -2246,10 +2246,4 @@ namespace MWWorld ++it; } } - - - void World::updateAnimParts(const Ptr& actor) - { - mRendering->updateAnimParts(actor); - } } diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index 456d1491f9..19890b8310 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -490,8 +490,6 @@ namespace MWWorld virtual void castSpell (const MWWorld::Ptr& actor); - virtual void updateAnimParts(const MWWorld::Ptr& ptr); - virtual void launchProjectile (const std::string& id, const ESM::EffectList& effects, const MWWorld::Ptr& actor, const std::string& sourceName); };