teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix wolfrun sound playing all the time when running is default

Browse source
This commit is contained in:
MiroslavR 2014-09-06 05:52:47 +02:00
parent 57f7ef1db4
commit b1a449a0b9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -794,6 +794,7 @@ bool CharacterController::updateWeaponState()
{ {
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
if(cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run) if(cls.getCreatureStats(mPtr).getStance(MWMechanics::CreatureStats::Stance_Run)
&& mHasMovedInXY
&& !MWBase::Environment::get().getWorld()->isSwimming(mPtr) && !MWBase::Environment::get().getWorld()->isSwimming(mPtr)
&& mWeaponType == WeapType_None) && mWeaponType == WeapType_None)
{ {
@ -1249,11 +1250,12 @@ void CharacterController::update(float duration)
CharacterState idlestate = CharState_SpecialIdle; CharacterState idlestate = CharState_SpecialIdle;
bool forcestateupdate = false; bool forcestateupdate = false;
isrunning = isrunning && std::abs(vec[0])+std::abs(vec[1]) > 0.0f; mHasMovedInXY = std::abs(vec[0])+std::abs(vec[1]) > 0.0f;
isrunning = isrunning && mHasMovedInXY;
// advance athletics // advance athletics
if(std::abs(vec[0])+std::abs(vec[1]) > 0.0f && mPtr.getRefData().getHandle() == "player") if(mHasMovedInXY && mPtr.getRefData().getHandle() == "player")
{ {
if(inwater) if(inwater)
{ {

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

@ -147,6 +147,7 @@ class CharacterController
CharacterState mMovementState; CharacterState mMovementState;
std::string mCurrentMovement; std::string mCurrentMovement;
float mMovementSpeed; float mMovementSpeed;
bool mHasMovedInXY;
bool mMovementAnimationControlled; bool mMovementAnimationControlled;
CharacterState mDeathState; CharacterState mDeathState;