From 1a0c3dc6cf56db66fdb6964b3e14b975b6dfd02f Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Sat, 11 Oct 2014 22:33:11 +0200
Subject: [PATCH] Issue #1887: Equipped items do not emit sounds
Removed unused mUnequipping and mFirstEquip member variables.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
apps/openmw/mwrender/npcanimation.cpp | 3 ---
apps/openmw/mwrender/npcanimation.hpp | 3 ---
2 files changed, 6 deletions(-)
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 37e9e14ad..be48e387a 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -187,8 +187,6 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int v
mFirstPersonOffset(0.f, 0.f, 0.f),
mAlpha(1.f),
mNpcType(Type_Normal),
- mUnequipping(false),
- mFirstEquip(true),
mInv(ptr.getClass().getInventoryStore(ptr))
{
mNpc = mPtr.get<ESM::NPC>()->mBase;
@@ -664,7 +662,6 @@ bool NpcAnimation::addOrReplaceIndividualPart(ESM::PartReferenceType type, int g
std::string soundId;
MWWorld::ContainerStoreIterator csi = mInv.getSlot(group < 0 ? MWWorld::InventoryStore::Slot_Helmet : group);
-
if (csi != mInv.end() && csi->getTypeName() == typeid(ESM::Light).name())
{
soundId = csi->get<ESM::Light>()->mBase->mSound;
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 827859b04..45481b837 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -97,9 +97,6 @@ private:
Ogre::SharedPtr<WeaponAnimationTime> mWeaponAnimationTime;
float mAlpha;
- bool mUnequipping;
- bool mFirstEquip;
-
MWWorld::InventoryStore& mInv;
void updateNpcBase();