mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 10:23:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'namingiseverything' into 'master'

Browse source 
Rename updateState() back into updateWeaponState()

See merge request OpenMW/openmw!2202
This commit is contained in:
Evil Eye 2022-07-29 15:56:12 +00:00
commit 299bd019df
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1110,7 +1110,7 @@ bool CharacterController::updateCarriedLeftVisible(const int weaptype) const
return mAnimation->updateCarriedLeftVisible(weaptype); return mAnimation->updateCarriedLeftVisible(weaptype);
} }
bool CharacterController::updateState(CharacterState idle) bool CharacterController::updateWeaponState(CharacterState idle)
{ {
const auto world = MWBase::Environment::get().getWorld(); const auto world = MWBase::Environment::get().getWorld();
auto& prng = world->getPrng(); auto& prng = world->getPrng();
@ -2253,7 +2253,7 @@ void CharacterController::update(float duration)
if (!mSkipAnim) if (!mSkipAnim)
{ {
refreshCurrentAnims(idlestate, movestate, jumpstate, updateState(idlestate)); refreshCurrentAnims(idlestate, movestate, jumpstate, updateWeaponState(idlestate));
updateIdleStormState(inwater); updateIdleStormState(inwater);
} }

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

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