diff options
| author | aap <aap@papnet.eu> | 2019-07-17 12:26:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 12:26:45 +0200 |
| commit | 3bda0da403ef4c7cd989fff8035863c5a39b009a (patch) | |
| tree | 08e908d1ec1fa35efc9626ad3662b71ed10025c5 /src/vehicles | |
| parent | more fixes; started CAutomobile::ProcessControl (diff) | |
| parent | fix fix (diff) | |
| download | re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.tar re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.tar.gz re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.tar.bz2 re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.tar.lz re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.tar.xz re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.tar.zst re3-3bda0da403ef4c7cd989fff8035863c5a39b009a.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Automobile.cpp | 2 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index ba8388d6..9e6ec173 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -1255,7 +1255,7 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type) obj->m_fElasticity = 0.1f; obj->m_fBuoyancy = obj->m_fMass*GRAVITY/0.75f; obj->ObjectCreatedBy = TEMP_OBJECT; - obj->bIsStatic = true; + obj->bIsStatic = false; obj->bIsPickup = false; obj->bUseVehicleColours = true; obj->m_colour1 = m_currentColour1; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index 2781f9f5..3ef581a0 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -383,6 +383,9 @@ CVehicle::ProcessDelayedExplosion(void) if(IsCar() && ((CAutomobile*)this)->m_bombType == 4 && (m_nBombTimer & 0xFE00) != 0xFE00) DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_BOMB_TICK, 0.0f); + if (m_nBombTimer != 0) + return; + if(FindPlayerVehicle() != this && m_pBlowUpEntity == FindPlayerPed()) CWorld::Players[CWorld::PlayerInFocus].AwardMoneyForExplosion(this); BlowUpCar(m_pBlowUpEntity); |