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

Don't play idlestorm animation when swimming

Browse source
This commit is contained in:
scrawl 2015-11-03 17:48:35 +01:00
parent c0a81030bb
commit b72d5c5190
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -504,8 +504,6 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
mAnimation->play(mCurrentIdle, idlePriority, MWRender::Animation::BlendMask_All, false, mAnimation->play(mCurrentIdle, idlePriority, MWRender::Animation::BlendMask_All, false,
1.0f, "start", "stop", 0.0f, ~0ul, true); 1.0f, "start", "stop", 0.0f, ~0ul, true);
} }
updateIdleStormState();
} }
@ -867,7 +865,7 @@ void CharacterController::updatePtr(const MWWorld::Ptr &ptr)
mPtr = ptr; mPtr = ptr;
} }
void CharacterController::updateIdleStormState() void CharacterController::updateIdleStormState(bool inwater)
{ {
bool inStormDirection = false; bool inStormDirection = false;
if (MWBase::Environment::get().getWorld()->isInStorm()) if (MWBase::Environment::get().getWorld()->isInStorm())
@ -877,7 +875,7 @@ void CharacterController::updateIdleStormState()
inStormDirection = std::acos(stormDirection * characterDirection / (stormDirection.length() * characterDirection.length())) inStormDirection = std::acos(stormDirection * characterDirection / (stormDirection.length() * characterDirection.length()))
> osg::DegreesToRadians(120.f); > osg::DegreesToRadians(120.f);
} }
if (inStormDirection && mUpperBodyState == UpperCharState_Nothing && mAnimation->hasAnimation("idlestorm")) if (inStormDirection && !inwater && mUpperBodyState == UpperCharState_Nothing && mAnimation->hasAnimation("idlestorm"))
{ {
float complete = 0; float complete = 0;
mAnimation->getInfo("idlestorm", &complete); mAnimation->getInfo("idlestorm", &complete);
@ -1796,6 +1794,7 @@ void CharacterController::update(float duration)
forcestateupdate = updateCreatureState() || forcestateupdate; forcestateupdate = updateCreatureState() || forcestateupdate;
refreshCurrentAnims(idlestate, movestate, jumpstate, forcestateupdate); refreshCurrentAnims(idlestate, movestate, jumpstate, forcestateupdate);
updateIdleStormState(inwater);
} }
if (inJump) if (inJump)

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

@ -196,7 +196,7 @@ class CharacterController : public MWRender::Animation::TextKeyListener
bool updateWeaponState(); bool updateWeaponState();
bool updateCreatureState(); bool updateCreatureState();
void updateIdleStormState(); void updateIdleStormState(bool inwater);
void updateHeadTracking(float duration); void updateHeadTracking(float duration);