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/Vehicle.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/Vehicle.cpp')
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 2625ab78..5f6ddafa 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -332,6 +332,9 @@ CVehicle::FlyingControl(eFlightModel flightModel) float fSteerLR = CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f; float fSteerUD = -CPad::GetPad(0)->GetSteeringUpDown() / 128.0f; float fGunUD = Abs(CPad::GetPad(0)->GetCarGunUpDown()); +#ifdef FREE_CAM + if(!CCamera::bFreeCam || (CCamera::bFreeCam && !CPad::IsAffectedByController)) +#endif if(fGunUD > 1.0f) fSteerUD = -CPad::GetPad(0)->GetCarGunUpDown() / 128.0f; @@ -505,9 +508,15 @@ CVehicle::FlyingControl(eFlightModel flightModel) fYaw = CPad::GetPad(0)->GetLookRight(); if (CPad::GetPad(0)->GetLookLeft()) fYaw = -1.0f; +#ifdef FREE_CAM + if (!CCamera::bFreeCam || (CCamera::bFreeCam && !CPad::IsAffectedByController)) +#endif if(Abs(CPad::GetPad(0)->GetCarGunLeftRight()) > 1.0f) fYaw = CPad::GetPad(0)->GetCarGunLeftRight() / 128.0f; } +#ifdef FREE_CAM + if(!CCamera::bFreeCam || (CCamera::bFreeCam && !CPad::IsAffectedByController)) +#endif if(Abs(CPad::GetPad(0)->GetCarGunUpDown()) > 1.0f) fPitch = -CPad::GetPad(0)->GetCarGunUpDown() / 128.0f; if (CPad::GetPad(0)->GetHorn()) { |