summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-17 12:24:04 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-07-17 12:24:04 +0200
commita9a62a8641571bb68564714907bb4bc1be29bc6c (patch)
treea780de15ce8d6fdd336fd10a96da39bc2a845cb1 /src/vehicles
parentmore fixes; started CAutomobile::ProcessControl (diff)
downloadre3-a9a62a8641571bb68564714907bb4bc1be29bc6c.tar
re3-a9a62a8641571bb68564714907bb4bc1be29bc6c.tar.gz
re3-a9a62a8641571bb68564714907bb4bc1be29bc6c.tar.bz2
re3-a9a62a8641571bb68564714907bb4bc1be29bc6c.tar.lz
re3-a9a62a8641571bb68564714907bb4bc1be29bc6c.tar.xz
re3-a9a62a8641571bb68564714907bb4bc1be29bc6c.tar.zst
re3-a9a62a8641571bb68564714907bb4bc1be29bc6c.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Automobile.cpp2
-rw-r--r--src/vehicles/Vehicle.cpp3
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);