mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-01 06:09:42 +00:00
Merge branch 'fix_controller_controls_cam' into 'master'
Fix player looking/controls via controller See merge request OpenMW/openmw!3890
This commit is contained in:
commit
99d0fc6f75
1 changed files with 3 additions and 3 deletions
|
@ -220,14 +220,14 @@ namespace MWInput
|
||||||
};
|
};
|
||||||
|
|
||||||
// Only actually turn player when we're not in vanity mode
|
// Only actually turn player when we're not in vanity mode
|
||||||
bool controls = MWBase::Environment::get().getInputManager()->getControlSwitch("playercontrols");
|
bool playerLooking = MWBase::Environment::get().getInputManager()->getControlSwitch("playerlooking");
|
||||||
if (!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot) && controls)
|
if (!MWBase::Environment::get().getWorld()->vanityRotateCamera(rot) && playerLooking)
|
||||||
{
|
{
|
||||||
MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
|
MWWorld::Player& player = MWBase::Environment::get().getWorld()->getPlayer();
|
||||||
player.yaw(-rot[2]);
|
player.yaw(-rot[2]);
|
||||||
player.pitch(-rot[0]);
|
player.pitch(-rot[0]);
|
||||||
}
|
}
|
||||||
else if (!controls)
|
else if (!playerLooking)
|
||||||
MWBase::Environment::get().getWorld()->disableDeferredPreviewRotation();
|
MWBase::Environment::get().getWorld()->disableDeferredPreviewRotation();
|
||||||
|
|
||||||
MWBase::Environment::get().getInputManager()->resetIdleTime();
|
MWBase::Environment::get().getInputManager()->resetIdleTime();
|
||||||
|
|
Loading…
Reference in a new issue