mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'controls' into 'master'

Browse Source 
Fix jumping (was broken by !2541)

See merge request OpenMW/openmw!2572
This commit is contained in:
psi29a 2023-01-03 08:51:21 +00:00
commit 28dcde8909
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,8 @@ namespace MWMechanics
{
mov.mPosition[0] = controls.mSideMovement;
mov.mPosition[1] = controls.mMovement;
mov.mPosition[2] = controls.mJump ? 1 : 0;
if (controls.mJump)
mov.mPosition[2] = 1;
mov.mRotation[0] = controls.mPitchChange;
mov.mRotation[1] = 0;
mov.mRotation[2] = controls.mYawChange;
@ -1731,6 +1732,10 @@ namespace MWMechanics
MWBase::Environment::get().getWorld()->applyDeferredPreviewRotationToPlayer(duration);
playerCharacter->update(duration);
playerCharacter->setVisibility(1.f);
MWBase::LuaManager::ActorControls* luaControls
= MWBase::Environment::get().getLuaManager()->getActorControls(player);
if (luaControls && player.getClass().getMovementSettings(player).mPosition[2] < 1)
luaControls->mJump = false;
}
for (const Actor& actor : mActors)