Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feedback needed] Stance switching changes, part II #1428

Merged
5 commits merged into from
Sep 1, 2017
Merged

[Feedback needed] Stance switching changes, part II #1428

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f22d81
Do not allow to switch weapon to probe or lockpick during attack
akortunov Aug 31, 2017
91dcd5b
Do not allow to unequip weapon from inventory during attack
akortunov Aug 31, 2017
0d7279e
Fixes a regression with bound weapons equipping (bug #4050)
akortunov Sep 1, 2017
a5b01fe
Allow to interrupt an attack, if attack button is held
akortunov Sep 1, 2017
7f5f545
Reset player attack animation when unequip weapon or tool
akortunov Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Reset player attack animation when unequip weapon or tool
  • Loading branch information
@akortunov
akortunov committed Sep 1, 2017
commit 7f5f5458d448fbc8eaa422047d14d6c0762b6733
4 changes: 4 additions & 0 deletions apps/openmw/mwrender/npcanimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "../mwworld/esmstore.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwworld/class.hpp"
#include "../mwworld/player.hpp"

#include "../mwmechanics/npcstats.hpp"
#include "../mwmechanics/actorutil.hpp"
Expand Down Expand Up @@ -919,6 +920,9 @@ void NpcAnimation::showWeapons(bool showWeapon)
else
{
removeIndividualPart(ESM::PRT_Weapon);
// If we remove/hide weapon from player, we should reset attack animation as well
if (mPtr == MWMechanics::getPlayer())
MWBase::Environment::get().getWorld()->getPlayer().setAttackingOrSpell(false);
}
}

Expand Down