mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 02:15:34 +00:00
Code Issues Releases Wiki Activity

Remove unused NpcAnimation visibilityFlags

Browse source
This commit is contained in:
scrawl 2015-06-22 21:14:44 +02:00
parent d5b73f2a55
commit d7695f2560
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/characterpreview.cpp
View file

@ -158,7 +158,7 @@ namespace MWRender
delete mAnimation; delete mAnimation;
mAnimation = NULL; mAnimation = NULL;
mAnimation = new NpcAnimation(mCharacter, mNode, mResourceSystem, 0, true, true, mAnimation = new NpcAnimation(mCharacter, mNode, mResourceSystem, true, true,
(renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal)); (renderHeadOnly() ? NpcAnimation::VM_HeadOnly : NpcAnimation::VM_Normal));
onSetup(); onSetup();

2
apps/openmw/mwrender/npcanimation.cpp
View file

@ -270,7 +270,7 @@ NpcAnimation::~NpcAnimation()
mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr); mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr);
} }
NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem, int visibilityFlags, bool disableListener, bool disableSounds, ViewMode viewMode) NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem, bool disableListener, bool disableSounds, ViewMode viewMode)
: Animation(ptr, parentNode, resourceSystem), : Animation(ptr, parentNode, resourceSystem),
mListenerDisabled(disableListener), mListenerDisabled(disableListener),
mViewMode(viewMode), mViewMode(viewMode),

5
apps/openmw/mwrender/npcanimation.hpp
View file

@ -90,8 +90,6 @@ protected:
public: public:
/** /**
* @param ptr * @param ptr
* @param node
* @param visibilityFlags
* @param disableListener Don't listen for equipment changes and magic effects. InventoryStore only supports * @param disableListener Don't listen for equipment changes and magic effects. InventoryStore only supports
* one listener at a time, so you shouldn't do this if creating several NpcAnimations * one listener at a time, so you shouldn't do this if creating several NpcAnimations
* for the same Ptr, eg preview dolls for the player. * for the same Ptr, eg preview dolls for the player.
@ -99,8 +97,7 @@ public:
* @param disableSounds Same as \a disableListener but for playing items sounds * @param disableSounds Same as \a disableListener but for playing items sounds
* @param viewMode * @param viewMode
*/ */
NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem, NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> parentNode, Resource::ResourceSystem* resourceSystem, bool disableListener = false,
int visibilityFlags, bool disableListener = false,
bool disableSounds = false, ViewMode viewMode=VM_Normal); bool disableSounds = false, ViewMode viewMode=VM_Normal);
virtual ~NpcAnimation(); virtual ~NpcAnimation();

2
apps/openmw/mwrender/objects.cpp
View file

@ -156,7 +156,7 @@ void Objects::insertNPC(const MWWorld::Ptr &ptr)
insertBegin(ptr); insertBegin(ptr);
ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor); ptr.getRefData().getBaseNode()->setNodeMask(Mask_Actor);
std::auto_ptr<NpcAnimation> anim (new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem, 0)); std::auto_ptr<NpcAnimation> anim (new NpcAnimation(ptr, osg::ref_ptr<osg::Group>(ptr.getRefData().getBaseNode()), mResourceSystem));
mObjects.insert(std::make_pair(ptr, anim.release())); mObjects.insert(std::make_pair(ptr, anim.release()));
} }