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

Issue #1887: Equipped items do not emit sounds

Browse source 
Removed unused mUnequipping and mFirstEquip member variables.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2014-10-11 22:33:11 +02:00
parent 3b9cfba03c
commit 1a0c3dc6cf
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,8 +187,6 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int v
mFirstPersonOffset(0.f, 0.f, 0.f), mFirstPersonOffset(0.f, 0.f, 0.f),
mAlpha(1.f), mAlpha(1.f),
mNpcType(Type_Normal), mNpcType(Type_Normal),
mUnequipping(false),
mFirstEquip(true),
mInv(ptr.getClass().getInventoryStore(ptr)) mInv(ptr.getClass().getInventoryStore(ptr))
{ {
mNpc = mPtr.get<ESM::NPC>()->mBase; mNpc = mPtr.get<ESM::NPC>()->mBase;
@ -664,7 +662,6 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
std::string soundId; std::string soundId;
MWWorld::ContainerStoreIterator csi = mInv.getSlot(group < 0 ? MWWorld::InventoryStore::Slot_Helmet : group); MWWorld::ContainerStoreIterator csi = mInv.getSlot(group < 0 ? MWWorld::InventoryStore::Slot_Helmet : group);
if (csi != mInv.end() && csi->getTypeName() == typeid(ESM::Light).name()) if (csi != mInv.end() && csi->getTypeName() == typeid(ESM::Light).name())
{ {
soundId = csi->get<ESM::Light>()->mBase->mSound; soundId = csi->get<ESM::Light>()->mBase->mSound;

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

@ -97,9 +97,6 @@ private:
Ogre::SharedPtr<WeaponAnimationTime> mWeaponAnimationTime; Ogre::SharedPtr<WeaponAnimationTime> mWeaponAnimationTime;
float mAlpha; float mAlpha;
bool mUnequipping;
bool mFirstEquip;
MWWorld::InventoryStore& mInv; MWWorld::InventoryStore& mInv;
void updateNpcBase(); void updateNpcBase();