teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Improve synchronization of Actor swings

Browse source
This commit is contained in:
David Cernat 2017-04-25 01:47:43 +03:00
parent ce9605957a
commit a4165325fa
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/openmw/mwmechanics/aicombat.cpp
View file

@ -210,6 +210,24 @@ namespace MWMechanics
storage.updateCombatMove(duration); storage.updateCombatMove(duration);
if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage); if (storage.mReadyToAttack) updateActorsMovement(actor, duration, storage);
storage.updateAttack(characterController); storage.updateAttack(characterController);
/*
Start of tes3mp addition
Record that this actor is updating an attack so that a packet will be sent about it
*/
mwmp::Attack *localAttack = mwmp::Main::get().getMechanicsHelper()->getLocalAttack(actor);
if (localAttack && localAttack->pressed != storage.mAttack)
{
mwmp::Main::get().getMechanicsHelper()->resetAttack(localAttack);
localAttack->type = mwmp::Attack::MELEE;
localAttack->pressed = storage.mAttack;
localAttack->shouldSend = true;
}
/*
End of tes3mp addition
*/
} }
else else
{ {
@ -272,7 +290,7 @@ namespace MWMechanics
*/ */
mwmp::Attack *localAttack = mwmp::Main::get().getMechanicsHelper()->getLocalAttack(actor); mwmp::Attack *localAttack = mwmp::Main::get().getMechanicsHelper()->getLocalAttack(actor);
if (localAttack->pressed != false) if (localAttack && localAttack->pressed != false)
{ {
mwmp::Main::get().getMechanicsHelper()->resetAttack(localAttack); mwmp::Main::get().getMechanicsHelper()->resetAttack(localAttack);
localAttack->type = mwmp::Attack::MELEE; localAttack->type = mwmp::Attack::MELEE;
@ -625,7 +643,7 @@ namespace MWMechanics
*/ */
mwmp::Attack *localAttack = mwmp::Main::get().getMechanicsHelper()->getLocalAttack(actor); mwmp::Attack *localAttack = mwmp::Main::get().getMechanicsHelper()->getLocalAttack(actor);
if (localAttack->pressed != true) if (localAttack && localAttack->pressed != true)
{ {
mwmp::Main::get().getMechanicsHelper()->resetAttack(localAttack); mwmp::Main::get().getMechanicsHelper()->resetAttack(localAttack);
localAttack->type = mwmp::Attack::MELEE; localAttack->type = mwmp::Attack::MELEE;