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

[Client] Add createSpellGfx() method to MechanicsHelper

Browse source 
Use it to create spell GFX when adding active spells to dedicated players and actors.
This commit is contained in:
David Cernat 2021-10-16 01:35:30 +02:00
parent eb005a5c33
commit 3e582199fb
4 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -368,6 +368,8 @@ void DedicatedActor::addSpellsActive()
MWWorld::TimeStamp timestamp = MWWorld::TimeStamp(activeSpell.timestampHour, activeSpell.timestampDay);
int casterActorId = MechanicsHelper::getActorId(activeSpell.caster);
MechanicsHelper::createSpellGfx(getPtr(), activeSpell.params.mEffects);
// Don't do a check for a spell's existence, because active effects from potions need to be applied here too
activeSpells.addSpell(activeSpell.id, activeSpell.isStackingSpell, activeSpell.params.mEffects, activeSpell.params.mDisplayName, casterActorId, timestamp, false);
}

2
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -507,6 +507,8 @@ void DedicatedPlayer::addSpellsActive()
MWWorld::TimeStamp timestamp = MWWorld::TimeStamp(activeSpell.timestampHour, activeSpell.timestampDay);
int casterActorId = MechanicsHelper::getActorId(activeSpell.caster);
MechanicsHelper::createSpellGfx(getPtr(), activeSpell.params.mEffects);
// Don't do a check for a spell's existence, because active effects from potions need to be applied here too
activeSpells.addSpell(activeSpell.id, activeSpell.isStackingSpell, activeSpell.params.mEffects, activeSpell.params.mDisplayName, casterActorId, timestamp, false);
}

24
apps/openmw/mwmp/MechanicsHelper.cpp
View file

@ -13,6 +13,8 @@
#include "../mwmechanics/spellcasting.hpp"
#include "../mwmechanics/spellutil.hpp"
#include "../mwrender/animation.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/inventorystore.hpp"
@ -562,6 +564,28 @@ void MechanicsHelper::processCast(Cast cast, const MWWorld::Ptr& caster)
}
}
void MechanicsHelper::createSpellGfx(const MWWorld::Ptr& targetPtr, const std::vector<ESM::ActiveEffect>& mEffects)
{
for (auto&& effect : mEffects)
{
const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
const ESM::Static* castStatic;
if (!magicEffect->mHit.empty())
castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find(magicEffect->mHit);
else
castStatic = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>().find("VFX_DefaultHit");
bool loop = (magicEffect->mData.mFlags & ESM::MagicEffect::ContinuousVfx) != 0;
// Note: in case of non actor, a free effect should be fine as well
MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(targetPtr);
if (anim && !castStatic->mModel.empty())
{
anim->addEffect("meshes\\" + castStatic->mModel, magicEffect->mIndex, loop, "", magicEffect->mParticle);
}
}
}
bool MechanicsHelper::isStackingSpell(const std::string& id)
{
return !MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().search(id);

2
apps/openmw/mwmp/MechanicsHelper.hpp
View file

@ -46,6 +46,8 @@ namespace MechanicsHelper
void processAttack(mwmp::Attack attack, const MWWorld::Ptr& attacker);
void processCast(mwmp::Cast cast, const MWWorld::Ptr& caster);
void createSpellGfx(const MWWorld::Ptr& targetPtr, const std::vector<ESM::ActiveEffect>& mEffects);
bool isStackingSpell(const std::string& id);
bool doesEffectListContainEffect(const ESM::EffectList& effectList, short effectId, short attributeId = -1, short skillId = -1);
void unequipItemsByEffect(const MWWorld::Ptr& ptr, short enchantmentType, short effectId, short attributeId = -1, short skillId = -1);