diff options
| author | withmorten <morten.with@gmail.com> | 2021-01-18 17:25:31 +0100 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-01-18 17:25:31 +0100 |
| commit | df4e22e3d010b3dd70e0f6add5764b7265370a12 (patch) | |
| tree | 8a8eefa46a2ff948c6e0a522ac2fc2a90c7111b4 /src/vehicles/Automobile.cpp | |
| parent | sync milessdk with re3mss (diff) | |
| download | re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.tar re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.tar.gz re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.tar.bz2 re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.tar.lz re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.tar.xz re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.tar.zst re3-df4e22e3d010b3dd70e0f6add5764b7265370a12.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 cafd4a36..89ba43d9 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -1424,7 +1424,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) |