mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-28 20:06:41 +00:00
Code Issues Releases Wiki Activity

Use distance to position since last normal state in obstacle checker

Browse source
This commit is contained in:
elsid 2020-02-06 00:20:55 +01:00
parent 52945921a7
commit 0c92a567af
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwmechanics/obstacle.cpp
View file

@ -120,6 +120,7 @@ namespace MWMechanics
mWalkState = WalkState::Norm; mWalkState = WalkState::Norm;
mStateDuration = 0; mStateDuration = 0;
mPrev = position; mPrev = position;
mInitialDistance = (destination - position).length();
return; return;
} }
@ -129,10 +130,11 @@ namespace MWMechanics
const float prevDistance = (destination - mPrev).length(); const float prevDistance = (destination - mPrev).length();
const float currentDistance = (destination - position).length(); const float currentDistance = (destination - position).length();
const float movedDistance = prevDistance - currentDistance; const float movedDistance = prevDistance - currentDistance;
const float movedFromInitialDistance = mInitialDistance - currentDistance;
mPrev = position; mPrev = position;
if (movedDistance >= distSameSpot) if (movedDistance >= distSameSpot && movedFromInitialDistance >= distSameSpot)
{ {
mWalkState = WalkState::Norm; mWalkState = WalkState::Norm;
mStateDuration = 0; mStateDuration = 0;
@ -143,6 +145,7 @@ namespace MWMechanics
{ {
mWalkState = WalkState::CheckStuck; mWalkState = WalkState::CheckStuck;
mStateDuration = duration; mStateDuration = duration;
mInitialDistance = (destination - position).length();
return; return;
} }

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

@ -54,6 +54,7 @@ namespace MWMechanics
float mStateDuration; float mStateDuration;
int mEvadeDirectionIndex; int mEvadeDirectionIndex;
float mInitialDistance = 0;
void chooseEvasionDirection(); void chooseEvasionDirection();
}; };