From 25026a9b950b8752af149c26f33d06817f357cc9 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Thu, 29 Sep 2016 16:57:39 +0300 Subject: [PATCH] Allow player-controlled NPCs to have attack animations again --- apps/openmw/mwmechanics/character.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 4b197d273..e89ad2be7 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -1312,7 +1312,11 @@ bool CharacterController::updateWeaponState() mAttackType = "shoot"; else { - if(mPtr == getPlayer()) + // tes3mp needs player-controlled NPCs to not have their attacks + // cancelled here, so a 2nd condition has been added that should + // return true only for them + + if(mPtr == getPlayer() || !mPtr.getBase()->canChangeCell) { if (isWeapon) {