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

Don't count as running if not actually moving along (local) X/Y

Browse source
This commit is contained in:
Chris Robinson 2013-08-09 06:53:07 -07:00
parent c2d8eb377f
commit a28c36de17
1 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -676,28 +676,12 @@ void CharacterController::update(float duration, Movement &movement)
Ogre::Vector3 rot = cls.getRotationVector(mPtr); Ogre::Vector3 rot = cls.getRotationVector(mPtr);
mMovementSpeed = cls.getSpeed(mPtr); mMovementSpeed = cls.getSpeed(mPtr);
// advance athletics CharacterState movestate = CharState_None;
if(vec.squaredLength() > 0 && mPtr.getRefData().getHandle() == "player") CharacterState idlestate = CharState_SpecialIdle;
{ bool forcestateupdate = false;
if(inwater)
{ vec.x *= mMovementSpeed;
mSecondsOfSwimming += duration; vec.y *= mMovementSpeed;
while(mSecondsOfSwimming > 1)
{
cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
mSecondsOfSwimming -= 1;
}
}
else if(isrunning)
{
mSecondsOfRunning += duration;
while(mSecondsOfRunning > 1)
{
cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
mSecondsOfRunning -= 1;
}
}
}
/* FIXME: The state should be set to Jump, and X/Y movement should be disallowed except /* FIXME: The state should be set to Jump, and X/Y movement should be disallowed except
* for the initial thrust (which would be carried by "physics" until landing). */ * for the initial thrust (which would be carried by "physics" until landing). */
@ -721,12 +705,30 @@ void CharacterController::update(float duration, Movement &movement)
//decrease fatigue by fFatigueJumpBase + (1 - normalizedEncumbrance) * fFatigueJumpMult; //decrease fatigue by fFatigueJumpBase + (1 - normalizedEncumbrance) * fFatigueJumpMult;
} }
vec.x *= mMovementSpeed; isrunning = isrunning && std::abs(vec[0])+std::abs(vec[1]) > 0.0f;
vec.y *= mMovementSpeed;
CharacterState movestate = CharState_None; // advance athletics
CharacterState idlestate = CharState_SpecialIdle; if(std::abs(vec[0])+std::abs(vec[1]) > 0.0f && mPtr.getRefData().getHandle() == "player")
bool forcestateupdate = false; {
if(inwater)
{
mSecondsOfSwimming += duration;
while(mSecondsOfSwimming > 1)
{
cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 1);
mSecondsOfSwimming -= 1;
}
}
else if(isrunning)
{
mSecondsOfRunning += duration;
while(mSecondsOfRunning > 1)
{
cls.skillUsageSucceeded(mPtr, ESM::Skill::Athletics, 0);
mSecondsOfRunning -= 1;
}
}
}
if(std::abs(vec.x/2.0f) > std::abs(vec.y)) if(std::abs(vec.x/2.0f) > std::abs(vec.y))
{ {