diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-16 00:03:08 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-16 00:03:08 +0200 |
| commit | 8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e (patch) | |
| tree | 42811fabbb52e7fd5afdbde4143a6e34c581eecc /src/vehicles | |
| parent | fix (diff) | |
| download | re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.tar re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.tar.gz re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.tar.bz2 re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.tar.lz re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.tar.xz re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.tar.zst re3-8e2ed40f66bfe8a97ab07bf5f5f653d700abea3e.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 3 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 1625b1b2..0b6f4422 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -495,7 +495,7 @@ CAutomobile::ProcessControl(void) m_aSuspensionSpringRatio[1] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[1].surfaceB) == ADHESIVE_SAND || m_aSuspensionSpringRatio[2] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[2].surfaceB) == ADHESIVE_SAND || m_aSuspensionSpringRatio[3] < 1.0f && CSurfaceTable::GetAdhesionGroup(m_aWheelColPoints[3].surfaceB) == ADHESIVE_SAND){ - if(GetModelIndex() != MI_RCBANDIT /*&& GetModelIndex() != MI_SANDKING*/ && GetModelIndex() != MI_BFINJECT){ + if(GetModelIndex() != MI_RCBANDIT && GetModelIndex() != MI_SANDKING && GetModelIndex() != MI_BFINJECT){ bStuckInSand = true; if(CWeather::WetRoads > 0.0f) ApplyMoveForce(m_vecMoveSpeed * -CTimer::GetTimeStep()*SAND_SLOWDOWN*m_fMass * (1.0f-CWeather::WetRoads)); diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index d1404b14..281311e8 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -84,6 +84,9 @@ CVehicle::CVehicle(uint8 CreatedBy) m_fGasPedal = 0.0f; m_fBrakePedal = 0.0; m_vehLCS_264 = 0; +#if defined FIX_BUGS || !defined GTA_PSP + bRewardVehicle = false; +#endif m_vehLCS_29E = 0; m_vehLCS_29C = 0; m_vehLCS_2A3 = -1; diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index b89c8158..dc044b53 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -248,7 +248,7 @@ public: #if (!defined GTA_PS2 || defined FIX_BUGS) // <- I think this can be moved back to CAutomobile? uint8 m_bombType : 3; #endif - uint8 bDriverLastFrame : 1; + uint8 bDriverLastFrame : 1; // originally not in CVehicle (TODO - carbomb stuff) uint8 bRewardVehicle : 1; // 25B_40 int8 m_numPedsUseItAsCover; |