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/Boat.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/Boat.cpp')
| -rw-r--r-- | src/vehicles/Boat.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index e97bfa0d..eae764b4 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -965,7 +965,14 @@ CBoat::PreRender(void) // FIX: Planes can also be controlled with GetCarGunUpDown #ifdef FIX_BUGS static float steeringUpDown = 0.0f; - steeringUpDown += ((Abs(CPad::GetPad(0)->GetCarGunUpDown()) > 1.0f ? (-CPad::GetPad(0)->GetCarGunUpDown() / 128.0f) : (-CPad::GetPad(0)->GetSteeringUpDown() / 128.0f)) - steeringUpDown) * Min(1.f, CTimer::GetTimeStep() / 5.f); +#ifdef FREE_CAM + if(!CCamera::bFreeCam || (CCamera::bFreeCam && !CPad::IsAffectedByController)) +#endif + steeringUpDown += ((Abs(CPad::GetPad(0)->GetCarGunUpDown()) > 1.0f ? (-CPad::GetPad(0)->GetCarGunUpDown()/128.0f) : (-CPad::GetPad(0)->GetSteeringUpDown()/128.0f)) - steeringUpDown) * Min(1.f, CTimer::GetTimeStep()/5.f); +#ifdef FREE_CAM + else + steeringUpDown = -CPad::GetPad(0)->GetSteeringUpDown()/128.0f; +#endif #else float steeringUpDown = -CPad::GetPad(0)->GetSteeringUpDown()/128.0f; #endif |