mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 18:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hand_to_nixhound' into 'master'

Browse Source 
Disallow non-bipedal hand-to-hand refreshes

See merge request OpenMW/openmw!1667
This commit is contained in:
psi29a 2022-02-16 22:30:39 +00:00
commit 4a2302ff2b
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())
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);
refreshMovementAnims(weap, movement, idle, force);
@ -1127,7 +1129,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
return mAnimation->updateCarriedLeftVisible(weaptype);
}
bool CharacterController::updateState(CharacterState& idle)
bool CharacterController::updateState(CharacterState idle)
{
const MWWorld::Class &cls = mPtr.getClass();
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);
bool updateState(CharacterState& idle);
bool updateState(CharacterState idle);
void updateIdleStormState(bool inwater);
std::string chooseRandomAttackAnimation() const;