mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 21:45:32 +00:00
Code Issues Releases Wiki Activity

Issue #1887: Equipped items do not emit sounds

Browse source 
Added handling of autoEquip and unequipAll cases.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
This commit is contained in:
Lukasz Gromanowski 2014-10-04 22:27:23 +02:00
parent e566e4abf2
commit bcb38c3eba
4 changed files with 86 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,7 +186,9 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int v
mShowCarriedLeft(true),
mFirstPersonOffset(0.f, 0.f, 0.f),
mAlpha(1.f),
mNpcType(Type_Normal)
mNpcType(Type_Normal),
mUnequipping(false),
mFirstEquip(true)
{
mNpc = mPtr.get<ESM::NPC>()->mBase;
@ -928,31 +930,78 @@ void NpcAnimation::applyAlpha(float alpha, Ogre::Entity *ent, NifOgre::ObjectSce
}
}
void NpcAnimation::equipmentChanged (const MWWorld::Ptr& actor, const MWWorld::Ptr& item, InventoryStoreListener::State state)
void NpcAnimation::equipmentChanged(const MWWorld::Ptr& actor, const MWWorld::Ptr& item, InventoryStoreListener::State state)
{
if (actor.getRefData().getHandle() == "player" && !item.isEmpty())
if (actor.getRefData().getHandle() == "player")
{
std::string soundId;
if (item.getTypeName() == typeid(ESM::Light).name())
{
soundId = item.get<ESM::Light>()->mBase->mSound;
}
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
if (!soundId.empty())
if (state == InventoryStoreListener::EQUIP
|| state == InventoryStoreListener::UNEQUIP)
{
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
if (state == InventoryStoreListener::EQUIPPED)
if (item.getTypeName() == typeid(ESM::Light).name())
{
sndMgr->playSound3D(mPtr, soundId, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Loop);
soundId = item.get<ESM::Light>()->mBase->mSound;
}
else if (state == InventoryStoreListener::UNEQUIPPED)
if (!soundId.empty())
{
sndMgr->stopSound3D(mPtr, soundId);
if (state == InventoryStoreListener::EQUIP)
{
sndMgr->playSound3D(mPtr, soundId, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Loop);
}
else
{
sndMgr->stopSound3D(mPtr, soundId);
}
}
}
else if (state == InventoryStoreListener::AUTOEQUIP)
{
const MWWorld::Class &cls = mPtr.getClass();
MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
for (int i = MWWorld::InventoryStore::Slot_Helmet; i < MWWorld::InventoryStore::Slots; ++i)
{
MWWorld::ContainerStoreIterator store = inv.getSlot(i);
if (store != inv.end() && store->getTypeName() == typeid(ESM::Light).name())
{
soundId = store->get<ESM::Light>()->mBase->mSound;
}
if (!soundId.empty())
{
sndMgr->playSound3D(mPtr, soundId, 1.0f, 1.0f, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Loop);
}
}
}
}
/**
* AUTOEQUIP is triggered just after setting listener (ie. when game is loaded from savegame),
* but not all things are initialized yet, so we have to check it (mFirstEquip variable)
* and skip one call to updateParts() method.
*
* Also call to updateParts() method will be called only once if inventory.unequipAll()
* was called (mUnequipping == true).
*/
if (state == InventoryStoreListener::UNEQUIPALL_BEGIN)
mUnequipping = true;
else if (state == InventoryStoreListener::UNEQUIPALL_END)
mUnequipping = false;
if (!mUnequipping && !mFirstEquip)
{
updateParts();
}
if (mFirstEquip && state == InventoryStoreListener::AUTOEQUIP)
{
mFirstEquip = false;
}
}

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

@ -51,7 +51,7 @@ public:
class NpcAnimation : public Animation, public WeaponAnimation, public MWWorld::InventoryStoreListener
{
public:
virtual void equipmentChanged() { updateParts(); }
virtual void equipmentChanged(const MWWorld::Ptr& actor, const MWWorld::Ptr& item, InventoryStoreListener::State state);
virtual void permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew, bool playSound);
public:
@ -97,6 +97,8 @@ private:
Ogre::SharedPtr<WeaponAnimationTime> mWeaponAnimationTime;
float mAlpha;
bool mUnequipping;
bool mFirstEquip;
void updateNpcBase();
@ -114,10 +116,6 @@ private:
void applyAlpha(float alpha, Ogre::Entity* ent, NifOgre::ObjectScenePtr scene);
/**
* Implementation of MWWorld::InventoryStoreListener equipmentChanged method
*/
void equipmentChanged (const MWWorld::Ptr& actor, const MWWorld::Ptr& item, InventoryStoreListener::State state);
public:
/**
* @param ptr

23
apps/openmw/mwworld/inventorystore.cpp
View file

@ -146,19 +146,18 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
flagAsModified();
fireEquipmentChangedEvent(actor, *iterator, InventoryStoreListener::EQUIPPED);
fireEquipmentChangedEvent(actor, *iterator, InventoryStoreListener::EQUIP);
updateMagicEffects(actor);
}
void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor)
{
// Only *one* change event should be fired
mUpdatesEnabled = false;
fireEquipmentChangedEvent(actor, MWWorld::Ptr(), InventoryStoreListener::UNEQUIPALL_BEGIN);
for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
unequipSlot(slot, actor);
mUpdatesEnabled = true;
fireEquipmentChangedEvent(actor, MWWorld::Ptr(), InventoryStoreListener::ALL_UNEQUIPPED);
fireEquipmentChangedEvent(actor, MWWorld::Ptr(), InventoryStoreListener::UNEQUIPALL_END);
updateMagicEffects(actor);
}
@ -277,17 +276,19 @@ void MWWorld::InventoryStore::autoEquip (const MWWorld::Ptr& actor)
bool changed = false;
for (std::size_t i=0; i<slots_.size(); ++i)
if (slots_[i]!=mSlots[i])
{
if (slots_[i] != mSlots[i])
{
changed = true;
break;
}
}
mUpdatesEnabled = true;
if (changed)
{
mSlots.swap (slots_);
fireEquipmentChangedEvent(actor, MWWorld::Ptr(), InventoryStoreListener::AUTOEQUIPPED);
fireEquipmentChangedEvent(actor, MWWorld::Ptr(), InventoryStoreListener::AUTOEQUIP);
updateMagicEffects(actor);
flagAsModified();
}
@ -520,7 +521,7 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
}
}
fireEquipmentChangedEvent(actor, *it, InventoryStoreListener::UNEQUIPPED);
fireEquipmentChangedEvent(actor, *it, InventoryStoreListener::UNEQUIP);
updateMagicEffects(actor);
return retval;
@ -545,6 +546,10 @@ void MWWorld::InventoryStore::setListener(InventoryStoreListener *listener, cons
{
mListener = listener;
updateMagicEffects(actor);
if (mListener != NULL)
{
mListener->equipmentChanged(actor, MWWorld::Ptr(), InventoryStoreListener::AUTOEQUIP);
}
}
void MWWorld::InventoryStore::fireEquipmentChangedEvent(const MWWorld::Ptr& actor, const MWWorld::Ptr& item, InventoryStoreListener::State state)

9
apps/openmw/mwworld/inventorystore.hpp
View file

@ -22,10 +22,11 @@ namespace MWWorld
public:
enum State
{
EQUIPPED,
AUTOEQUIPPED,
UNEQUIPPED,
ALL_UNEQUIPPED
EQUIP,
AUTOEQUIP,
UNEQUIP,
UNEQUIPALL_BEGIN,
UNEQUIPALL_END
};
/**