AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-26 06:21:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_5586' into 'master'

Browse Source 
Fix #5586

Closes #5586

See merge request OpenMW/openmw!291
This commit is contained in:
AnyOldName3 2020-09-01 00:09:32 +00:00
commit f5f59c1149
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwclass/npc.cpp
View File

@ -938,6 +938,8 @@ namespace MWClass
float Npc::getMaxSpeed(const MWWorld::Ptr& ptr) const float Npc::getMaxSpeed(const MWWorld::Ptr& ptr) const
{ {
// TODO: This function is called several times per frame for each NPC.
// It would be better to calculate it only once per frame for each NPC and save the result in CreatureStats.
const MWMechanics::CreatureStats& stats = getCreatureStats(ptr); const MWMechanics::CreatureStats& stats = getCreatureStats(ptr);
if (stats.isParalyzed() || stats.getKnockedDown() || stats.isDead()) if (stats.isParalyzed() || stats.getKnockedDown() || stats.isDead())
return 0.f; return 0.f;

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

@ -1965,8 +1965,11 @@ void CharacterController::update(float duration, bool animationOnly)
vec.normalize(); vec.normalize();
float effectiveRotation = rot.z(); float effectiveRotation = rot.z();
bool canMove = cls.getMaxSpeed(mPtr) > 0;
static const bool turnToMovementDirection = Settings::Manager::getBool("turn to movement direction", "Game"); static const bool turnToMovementDirection = Settings::Manager::getBool("turn to movement direction", "Game");
if (turnToMovementDirection && !isFirstPersonPlayer) if (!turnToMovementDirection || isFirstPersonPlayer)
movementSettings.mIsStrafing = std::abs(vec.x()) > std::abs(vec.y()) * 2;
else if (canMove)
{ {
float targetMovementAngle = vec.y() >= 0 ? std::atan2(-vec.x(), vec.y()) : std::atan2(vec.x(), -vec.y()); float targetMovementAngle = vec.y() >= 0 ? std::atan2(-vec.x(), vec.y()) : std::atan2(vec.x(), -vec.y());
movementSettings.mIsStrafing = (stats.getDrawState() != MWMechanics::DrawState_Nothing || inwater) movementSettings.mIsStrafing = (stats.getDrawState() != MWMechanics::DrawState_Nothing || inwater)
@ -1986,8 +1989,6 @@ void CharacterController::update(float duration, bool animationOnly)
stats.setSideMovementAngle(stats.getSideMovementAngle() + delta); stats.setSideMovementAngle(stats.getSideMovementAngle() + delta);
effectiveRotation += delta; effectiveRotation += delta;
} }
else
movementSettings.mIsStrafing = std::abs(vec.x()) > std::abs(vec.y()) * 2;
mAnimation->setLegsYawRadians(stats.getSideMovementAngle()); mAnimation->setLegsYawRadians(stats.getSideMovementAngle());
if (stats.getDrawState() == MWMechanics::DrawState_Nothing || inwater) if (stats.getDrawState() == MWMechanics::DrawState_Nothing || inwater)