mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 00:23:51 +00:00
Code Issues Releases Wiki Activity

Remove no longer used parameter

Browse source
This commit is contained in:
Allofich 2016-09-15 23:41:20 +09:00
parent 7eb62b5d3a
commit 5aad1d81f4
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -970,12 +970,12 @@ Resource::ResourceSystem* NpcAnimation::getResourceSystem()
return mResourceSystem; return mResourceSystem;
} }
void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew, bool playSound) void NpcAnimation::permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew)
{ {
// During first auto equip, we don't play any sounds. // During first auto equip, we don't play any sounds.
// Basically we don't want sounds when the actor is first loaded, // Basically we don't want sounds when the actor is first loaded,
// the items should appear as if they'd always been equipped. // the items should appear as if they'd always been equipped.
if (playSound) if (isNew)
{ {
static const std::string schools[] = { static const std::string schools[] = {
"alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"

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

@ -23,7 +23,7 @@ class NpcAnimation : public Animation, public WeaponAnimation, public MWWorld::I
{ {
public: public:
virtual void equipmentChanged(); virtual void equipmentChanged();
virtual void permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew, bool playSound); virtual void permanentEffectAdded(const ESM::MagicEffect *magicEffect, bool isNew);
public: public:
typedef std::map<ESM::PartReferenceType,std::string> PartBoneMap; typedef std::map<ESM::PartReferenceType,std::string> PartBoneMap;

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

@ -414,8 +414,7 @@ void MWWorld::InventoryStore::updateMagicEffects(const Ptr& actor)
// During first auto equip, we don't play any sounds. // During first auto equip, we don't play any sounds.
// Basically we don't want sounds when the actor is first loaded, // Basically we don't want sounds when the actor is first loaded,
// the items should appear as if they'd always been equipped. // the items should appear as if they'd always been equipped.
mListener->permanentEffectAdded(magicEffect, !mFirstAutoEquip, mListener->permanentEffectAdded(magicEffect, !mFirstAutoEquip);
!mFirstAutoEquip);
} }
if (magnitude) if (magnitude)

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

@ -32,7 +32,7 @@ namespace MWWorld
* If it isn't new, non-looping VFX should not be played. * If it isn't new, non-looping VFX should not be played.
* @param playSound Play effect sound? * @param playSound Play effect sound?
*/ */
virtual void permanentEffectAdded (const ESM::MagicEffect *magicEffect, bool isNew, bool playSound) {} virtual void permanentEffectAdded (const ESM::MagicEffect *magicEffect, bool isNew) {}
}; };