mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 19:39:42 +00:00
Code Issues Releases Wiki Activity

Disallow non-bipedal hand-to-hand refreshes

Browse source
This commit is contained in:
Evil Eye 2022-02-16 21:58:22 +01:00
parent b81d4cc11c
commit 7bd4971e0c
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/character.cpp
View file

@ -709,7 +709,9 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
if (mPtr.getClass().isActor()) if (mPtr.getClass().isActor())
refreshHitRecoilAnims(idle); refreshHitRecoilAnims(idle);
std::string weap = getWeaponType(mWeaponType)->mShortGroup; std::string weap;
if (mWeaponType != ESM::Weapon::HandToHand || mPtr.getClass().isBipedal(mPtr))
weap = getWeaponType(mWeaponType)->mShortGroup;
refreshJumpAnims(weap, jump, idle, force); refreshJumpAnims(weap, jump, idle, force);
refreshMovementAnims(weap, movement, idle, force); refreshMovementAnims(weap, movement, idle, force);
@ -1127,7 +1129,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
return mAnimation->updateCarriedLeftVisible(weaptype); return mAnimation->updateCarriedLeftVisible(weaptype);
} }
bool CharacterController::updateState(CharacterState& idle) bool CharacterController::updateState(CharacterState idle)
{ {
const MWWorld::Class &cls = mPtr.getClass(); const MWWorld::Class &cls = mPtr.getClass();
CreatureStats &stats = cls.getCreatureStats(mPtr); CreatureStats &stats = cls.getCreatureStats(mPtr);

2
apps/openmw/mwmechanics/character.hpp
View file

@ -205,7 +205,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
void clearAnimQueue(bool clearPersistAnims = false); void clearAnimQueue(bool clearPersistAnims = false);
bool updateState(CharacterState& idle); bool updateState(CharacterState idle);
void updateIdleStormState(bool inwater); void updateIdleStormState(bool inwater);
std::string chooseRandomAttackAnimation() const; std::string chooseRandomAttackAnimation() const;