diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-18 17:25:31 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-18 20:10:13 +0100 |
| commit | b5c09965a97574adbac6ef6f07ec382ef8d5c6c8 (patch) | |
| tree | 450e475ba0f68d087565d6b7cb9bead87048f1e3 /src/vehicles/Automobile.cpp | |
| parent | Merge pull request #962 from aap/lcs (diff) | |
| download | re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.tar re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.tar.gz re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.tar.bz2 re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.tar.lz re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.tar.xz re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.tar.zst re3-b5c09965a97574adbac6ef6f07ec382ef8d5c6c8.zip | |
Diffstat (limited to 'src/vehicles/Automobile.cpp')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index c915f7e2..17e93bf7 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -1039,7 +1039,12 @@ CAutomobile::ProcessControl(void) if (GetModelIndex() == MI_RCRAIDER || GetModelIndex() == MI_RCGOBLIN) FlyingControl(FLIGHT_MODEL_RCHELI); else if (m_nWheelsOnGround < 4 && !(GetModelIndex() == MI_SEASPAR && bTouchingWater) || - CPad::GetPad(0)->GetAccelerate() != 0 || CPad::GetPad(0)->GetCarGunUpDown() > 1.0f || + CPad::GetPad(0)->GetAccelerate() != 0 || +#ifndef FREE_CAM + CPad::GetPad(0)->GetCarGunUpDown() > 1.0f || +#else + ((!CCamera::bFreeCam || (CCamera::bFreeCam && !CPad::IsAffectedByController)) && CPad::GetPad(0)->GetCarGunUpDown() > 1.0f) || +#endif Abs(m_vecMoveSpeed.x) > 0.02f || Abs(m_vecMoveSpeed.y) > 0.02f || Abs(m_vecMoveSpeed.z) > 0.02f) |