mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-28 20:06:41 +00:00
Code Issues Releases Wiki Activity

[Client] Stop switching drawstates when receiving ActorAttack packets

Browse source 
Previously, some of the spammier ActorAttack packets were overriding spellcasting animations with weapon attack animations.
This commit is contained in:
David Cernat 2019-11-28 19:53:34 +02:00
parent ef944aa050
commit 5a46b40e1a
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmp/Cell.cpp
View file

@ -304,15 +304,6 @@ void Cell::readAttack(ActorList& actorList)
DedicatedActor *actor = dedicatedActors[mapIndex]; DedicatedActor *actor = dedicatedActors[mapIndex];
actor->attack = baseActor.attack; actor->attack = baseActor.attack;
// Set the correct drawState here if we've somehow we've missed a previous
// AnimFlags packet
if (actor->drawState != MWMechanics::DrawState_::DrawState_Weapon &&
(actor->attack.type == mwmp::Attack::MELEE || actor->attack.type == mwmp::Attack::RANGED))
{
actor->drawState = MWMechanics::DrawState_::DrawState_Weapon;
actor->setAnimFlags();
}
MechanicsHelper::processAttack(actor->attack, actor->getPtr()); MechanicsHelper::processAttack(actor->attack, actor->getPtr());
} }
} }
@ -333,8 +324,7 @@ void Cell::readCast(ActorList& actorList)
// Set the correct drawState here if we've somehow we've missed a previous // Set the correct drawState here if we've somehow we've missed a previous
// AnimFlags packet // AnimFlags packet
if (actor->drawState != MWMechanics::DrawState_::DrawState_Spell && if (actor->drawState != MWMechanics::DrawState_::DrawState_Spell)
(actor->attack.type == mwmp::Cast::REGULAR || actor->cast.type == mwmp::Cast::ITEM))
{ {
actor->drawState = MWMechanics::DrawState_::DrawState_Spell; actor->drawState = MWMechanics::DrawState_::DrawState_Spell;
actor->setAnimFlags(); actor->setAnimFlags();