diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-10-01 01:20:09 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-10-01 01:20:09 +0200 |
| commit | fe46aa5cc25d52ec434860d4ee72fbb1347adbe9 (patch) | |
| tree | ec4c6228f1d52627a602054fe9d682cc0ac1e569 /src/vehicles/Automobile.cpp | |
| parent | new implementation for car fly enhancment (diff) | |
| download | re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.tar re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.tar.gz re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.tar.bz2 re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.tar.lz re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.tar.xz re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.tar.zst re3-fe46aa5cc25d52ec434860d4ee72fbb1347adbe9.zip | |
Diffstat (limited to 'src/vehicles/Automobile.cpp')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 24c84703..08fe7718 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -1375,6 +1375,13 @@ CAutomobile::ProcessControl(void) // Flying bool playRotorSound = false; + bool isPlane = GetModelIndex() == MI_DODO || bAllDodosCheat; +#ifdef BETTER_ALLCARSAREDODO_CHEAT + isPlane = isPlane || bAltDodoCheat; +#endif +#ifdef FIX_BUGS + isPlane = isPlane && !IsRealHeli(); +#endif if(GetStatus() != STATUS_PLAYER && GetStatus() != STATUS_PLAYER_REMOTE && GetStatus() != STATUS_PHYSICS){ if(IsRealHeli()){ bEngineOn = false; @@ -1383,16 +1390,7 @@ CAutomobile::ProcessControl(void) if(m_aWheelSpeed[1] < 0.154f && m_aWheelSpeed[1] > 0.0044f) playRotorSound = true; } - }else if((GetModelIndex() == MI_DODO || CVehicle::bAllDodosCheat) && -#ifdef FIX_BUGS - !IsRealHeli() && -#endif - m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){ -#ifdef ALT_DODO_CHEAT - if (bAltDodoCheat) - FlyingControl(FLIGHT_MODEL_PLANE_UNUSED); - else -#endif + }else if(isPlane && m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){ if(GetModelIndex() == MI_DODO) FlyingControl(FLIGHT_MODEL_DODO); else |