From 8005d3ca2566896a21ffad2593bd22f8a797dc50 Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Fri, 29 Jul 2022 17:17:23 +0300 Subject: [PATCH] Rename updateState back into updateWeaponState --- apps/openmw/mwmechanics/character.cpp | 4 ++-- apps/openmw/mwmechanics/character.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index 6ac5e0b760..bcc30bc17b 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -1110,7 +1110,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const return mAnimation->updateCarriedLeftVisible(weaptype); } -bool CharacterController::updateState(CharacterState idle) +bool CharacterController::updateWeaponState(CharacterState idle) { const auto world = MWBase::Environment::get().getWorld(); auto& prng = world->getPrng(); @@ -2253,7 +2253,7 @@ void CharacterController::update(float duration) if (!mSkipAnim) { - refreshCurrentAnims(idlestate, movestate, jumpstate, updateState(idlestate)); + refreshCurrentAnims(idlestate, movestate, jumpstate, updateWeaponState(idlestate)); updateIdleStormState(inwater); } diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp index 323e2784df..7b3529d504 100644 --- a/apps/openmw/mwmechanics/character.hpp +++ b/apps/openmw/mwmechanics/character.hpp @@ -201,7 +201,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener void clearAnimQueue(bool clearPersistAnims = false); - bool updateState(CharacterState idle); + bool updateWeaponState(CharacterState idle); void updateIdleStormState(bool inwater) const; std::string chooseRandomAttackAnimation() const;