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

Merge pull request #2458 from Capostrophic/jump

Browse Source 
Don't "jump" with 0 vertical velocity in all cases (bug #5106)
This commit is contained in:
Andrei Kortunov 2019-08-09 21:03:24 +04:00 committed by GitHub
commit b09f0f8c2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -120,6 +120,7 @@
Bug #5099: Non-swimming enemies will enter water if player is water walking Bug #5099: Non-swimming enemies will enter water if player is water walking
Bug #5104: Black Dart's enchantment doesn't trigger at low Enchant levels Bug #5104: Black Dart's enchantment doesn't trigger at low Enchant levels
Bug #5105: NPCs start combat with werewolves from any distance Bug #5105: NPCs start combat with werewolves from any distance
Bug #5106: Still can jump even when encumbered
Bug #5110: ModRegion with a redundant numerical argument breaks script execution Bug #5110: ModRegion with a redundant numerical argument breaks script execution
Bug #5112: Insufficient magicka for current spell not reflected on HUD icon Bug #5112: Insufficient magicka for current spell not reflected on HUD icon
Bug #5123: Script won't run on respawn Bug #5123: Script won't run on respawn

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

@ -2014,7 +2014,8 @@ void CharacterController::update(float duration, bool animationOnly)
cls.getCreatureStats(mPtr).setFatigue(fatigue); cls.getCreatureStats(mPtr).setFatigue(fatigue);
} }
if(sneak || inwater || flying || incapacitated || !solid) float z = cls.getJump(mPtr);
if(sneak || inwater || flying || incapacitated || !solid || z <= 0)
vec.z() = 0.0f; vec.z() = 0.0f;
bool inJump = true; bool inJump = true;
@ -2037,7 +2038,6 @@ void CharacterController::update(float duration, bool animationOnly)
else if(vec.z() > 0.0f && mJumpState != JumpState_InAir) else if(vec.z() > 0.0f && mJumpState != JumpState_InAir)
{ {
// Started a jump. // Started a jump.
float z = cls.getJump(mPtr);
if (z > 0) if (z > 0)
{ {
if(vec.x() == 0 && vec.y() == 0) if(vec.x() == 0 && vec.y() == 0)