From d4ddaa3d9585411c9f7c7a8a90e12de2ce517db0 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Tue, 29 Jan 2013 01:08:52 -0800 Subject: [PATCH] Only register activators that have a MWRender::Animation object --- apps/openmw/mwmechanics/activators.cpp | 5 +++-- apps/openmw/mwmechanics/activators.hpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/activators.cpp b/apps/openmw/mwmechanics/activators.cpp index 20b7865f5..1a743cad5 100644 --- a/apps/openmw/mwmechanics/activators.cpp +++ b/apps/openmw/mwmechanics/activators.cpp @@ -12,10 +12,11 @@ Activators::Activators() { } -void Activators::addActivator (const MWWorld::Ptr& ptr) +void Activators::addActivator(const MWWorld::Ptr& ptr) { MWRender::Animation *anim = MWBase::Environment::get().getWorld()->getAnimation(ptr); - mActivators.insert(std::make_pair(ptr, CharacterController(ptr, anim, CharState_Idle, true))); + if(anim != NULL) + mActivators.insert(std::make_pair(ptr, CharacterController(ptr, anim, CharState_Idle, true))); } void Activators::removeActivator (const MWWorld::Ptr& ptr) diff --git a/apps/openmw/mwmechanics/activators.hpp b/apps/openmw/mwmechanics/activators.hpp index 5c3eba220..0b9e984aa 100644 --- a/apps/openmw/mwmechanics/activators.hpp +++ b/apps/openmw/mwmechanics/activators.hpp @@ -23,7 +23,7 @@ namespace MWMechanics Activators(); void addActivator (const MWWorld::Ptr& ptr); - ///< Register an activator + ///< Register an animated activator void removeActivator (const MWWorld::Ptr& ptr); ///< Deregister an activator