diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-10-08 20:39:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 20:39:11 +0200 |
| commit | b97f86deeaa80705941de14b95d32e801cae837f (patch) | |
| tree | 8c286f6992a58fc3db885a5579b0d49a22f30e68 /src/vehicles | |
| parent | Merge pull request #755 from theR4K/miami (diff) | |
| parent | Merge branch 'miami' into miami (diff) | |
| download | re3-b97f86deeaa80705941de14b95d32e801cae837f.tar re3-b97f86deeaa80705941de14b95d32e801cae837f.tar.gz re3-b97f86deeaa80705941de14b95d32e801cae837f.tar.bz2 re3-b97f86deeaa80705941de14b95d32e801cae837f.tar.lz re3-b97f86deeaa80705941de14b95d32e801cae837f.tar.xz re3-b97f86deeaa80705941de14b95d32e801cae837f.tar.zst re3-b97f86deeaa80705941de14b95d32e801cae837f.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Boat.cpp | 11 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 1664ffd0..8c9dd241 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -959,17 +959,24 @@ CBoat::PreRender(void) matrix.Translate(pos); matrix.UpdateRW(); } + // 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); +#else + float steeringUpDown = -CPad::GetPad(0)->GetSteeringUpDown()/128.0f; +#endif if(m_aBoatNodes[BOAT_REARFLAP_LEFT]){ matrix.Attach(RwFrameGetMatrix(m_aBoatNodes[BOAT_REARFLAP_LEFT])); pos = matrix.GetPosition(); - matrix.SetRotateX(-CPad::GetPad(0)->GetSteeringUpDown()/128.0f); + matrix.SetRotateX(steeringUpDown); matrix.Translate(pos); matrix.UpdateRW(); } if(m_aBoatNodes[BOAT_REARFLAP_RIGHT]){ matrix.Attach(RwFrameGetMatrix(m_aBoatNodes[BOAT_REARFLAP_RIGHT])); pos = matrix.GetPosition(); - matrix.SetRotateX(-CPad::GetPad(0)->GetSteeringUpDown()/128.0f); + matrix.SetRotateX(steeringUpDown); matrix.Translate(pos); matrix.UpdateRW(); } diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index e3d73771..6e86dbe4 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -41,6 +41,8 @@ bool CVehicle::bCheat3; bool CVehicle::bCheat4; bool CVehicle::bCheat5; bool CVehicle::bCheat8; +bool CVehicle::bCheat9; +bool CVehicle::bCheat10; bool CVehicle::bHoverCheat; bool CVehicle::bAllTaxisHaveNitro; bool CVehicle::m_bDisableMouseSteering = true; diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 6bd6f7c6..705fca3a 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -400,6 +400,8 @@ public: static bool bCheat4; static bool bCheat5; static bool bCheat8; + static bool bCheat9; + static bool bCheat10; static bool bHoverCheat; static bool bAllTaxisHaveNitro; static bool m_bDisableMouseSteering; |