krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Make sure effects are destroyed with the animation

Browse source
This commit is contained in:
scrawl 2013-11-12 02:13:36 +01:00
parent eccb8f38ba
commit 0dab7031c0
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/npc.cpp
View file

@ -445,7 +445,7 @@ namespace MWClass
skillUsageSucceeded(ptr, weapskill, 0); skillUsageSucceeded(ptr, weapskill, 0);
// Apply "On hit" enchanted weapons // Apply "On hit" enchanted weapons
std::string enchantmentName = weapon.getClass().getEnchantment(weapon); std::string enchantmentName = !weapon.isEmpty() ? weapon.getClass().getEnchantment(weapon) : "";
if (!enchantmentName.empty()) if (!enchantmentName.empty())
{ {
const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find( const ESM::Enchantment* enchantment = MWBase::Environment::get().getWorld()->getStore().get<ESM::Enchantment>().find(

3
apps/openmw/mwrender/animation.cpp
View file

@ -87,6 +87,9 @@ Animation::Animation(const MWWorld::Ptr &ptr, Ogre::SceneNode *node)
Animation::~Animation() Animation::~Animation()
{ {
for (std::vector<NifOgre::ObjectList>::iterator it = mEffects.begin(); it != mEffects.end(); ++it)
destroyObjectList(mInsert->getCreator(), *it);
mAnimSources.clear(); mAnimSources.clear();
Ogre::SceneManager *sceneMgr = mInsert->getCreator(); Ogre::SceneManager *sceneMgr = mInsert->getCreator();

1
apps/openmw/mwrender/animation.hpp
View file

@ -3,7 +3,6 @@
#include <OgreController.h> #include <OgreController.h>
#include <OgreVector3.h> #include <OgreVector3.h>
#include <OgreTimer.h>
#include <components/nifogre/ogrenifloader.hpp> #include <components/nifogre/ogrenifloader.hpp>