diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-03 01:26:49 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-03 01:26:49 +0200 |
| commit | 063a80ecfb3ccede8b2e5efc135abd2c48f285d2 (patch) | |
| tree | f69358f331007e86d3c257046cfb741ed44aee7e /src/vehicles | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.gz re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.bz2 re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.lz re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.xz re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.tar.zst re3-063a80ecfb3ccede8b2e5efc135abd2c48f285d2.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 3 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 11 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 3 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 08fe7718..2d6fc740 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -1376,9 +1376,6 @@ CAutomobile::ProcessControl(void) bool playRotorSound = false; bool isPlane = GetModelIndex() == MI_DODO || bAllDodosCheat; -#ifdef BETTER_ALLCARSAREDODO_CHEAT - isPlane = isPlane || bAltDodoCheat; -#endif #ifdef FIX_BUGS isPlane = isPlane && !IsRealHeli(); #endif diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 3ff9a044..4347c9b2 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -41,9 +41,6 @@ bool CVehicle::bCheat3; bool CVehicle::bCheat4; bool CVehicle::bCheat5; bool CVehicle::bCheat8; -#ifdef BETTER_ALLCARSAREDODO_CHEAT -bool CVehicle::bAltDodoCheat; -#endif bool CVehicle::bHoverCheat; bool CVehicle::bAllTaxisHaveNitro; bool CVehicle::m_bDisableMouseSteering = true; @@ -355,11 +352,11 @@ CVehicle::FlyingControl(eFlightModel flightModel) float fThrustFallOff = pFlyingHandling->fThrustFallOff; float fThrustFallOffBack = pFlyingHandling->fThrustFallOff * 8.0f; #ifdef BETTER_ALLCARSAREDODO_CHEAT - if (bAltDodoCheat && !IsRealPlane()) { + if (bAllDodosCheat && !IsRealPlane()) { fThrust = pHandling->Transmission.fEngineAcceleration * (pHandling->Transmission.nDriveType == '4' ? 4.0f : 2.0f); - fThrust = 5.0f * Max(fThrust, pFlyingHandling->fThrust); - fThrustFallOff = Min(1.0f / pHandling->Transmission.fMaxVelocity, fThrustFallOff); + fThrust = 5.0f * Max(fThrust, pFlyingHandling->fThrust); //tweak: (cars engines too weak to thrust car on air) + fThrustFallOff = Min(0.7f / pHandling->Transmission.fMaxVelocity, fThrustFallOff); //tweak: (use 0.7 instead of 1.0 to make cars 30% faster) fThrustFallOffBack = -1.0f / pHandling->Transmission.fMaxReverseVelocity; } #endif @@ -417,7 +414,7 @@ CVehicle::FlyingControl(eFlightModel flightModel) else if (flightModel == FLIGHT_MODEL_SEAPLANE && GetPosition().z > 80.0f) fLiftImpulse = CTimer::GetTimeStep() * 0.9f*GRAVITY * m_fMass; #ifdef BETTER_ALLCARSAREDODO_CHEAT - else if(GetPosition().z > 180.0f) + else if(bAllDodosCheat && GetPosition().z > 170.0f) fLiftImpulse = CTimer::GetTimeStep() * 0.9f * GRAVITY * m_fMass; #endif } diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 30f84ede..6bd6f7c6 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -400,9 +400,6 @@ public: static bool bCheat4; static bool bCheat5; static bool bCheat8; -#ifdef BETTER_ALLCARSAREDODO_CHEAT - static bool bAltDodoCheat; -#endif static bool bHoverCheat; static bool bAllTaxisHaveNitro; static bool m_bDisableMouseSteering; |