summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-19 13:58:19 +0200
committeraap <aap@papnet.eu>2019-07-19 13:58:19 +0200
commit0ad39c020cfd4882b45bd1d26e521748e37b94a4 (patch)
tree736fde80727300b695e649c18e67be340b384985 /src/vehicles/Automobile.cpp
parentCAutomobile ctor, car spawner, fixes (diff)
downloadre3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.tar
re3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.tar.gz
re3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.tar.bz2
re3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.tar.lz
re3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.tar.xz
re3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.tar.zst
re3-0ad39c020cfd4882b45bd1d26e521748e37b94a4.zip
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r--src/vehicles/Automobile.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 33f099b3..d6d05f5b 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -34,8 +34,6 @@ RwObject *GetCurrentAtomicObjectCB(RwObject *object, void *data);
bool &CAutomobile::m_sAllTaxiLights = *(bool*)0x95CD21;
-WRAPPER CAutomobile* CAutomobile::ctor(int, uint8) { EAXJMP(0x52C6B0); }
-
CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
: CVehicle(CreatedBy)
{
@@ -154,7 +152,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
m_bombType = CARBOMB_NONE;
bHadDriver = false;
- field_4DC = nil;
+ m_pBombRigger = nil;
if(m_nDoorLock == CARLOCK_UNLOCKED &&
(id == MI_POLICE || id == MI_ENFORCER || id == MI_RHINO))
@@ -257,7 +255,7 @@ CAutomobile::ProcessControl(void)
if(!bHadDriver && m_bombType == CARBOMB_ONIGNITIONACTIVE){
// If someone enters the car and there is a bomb, detonate
m_nBombTimer = 1000;
- m_pBlowUpEntity = field_4DC;
+ m_pBlowUpEntity = m_pBombRigger;
if(m_pBlowUpEntity)
m_pBlowUpEntity->RegisterReference((CEntity**)&m_pBlowUpEntity);
DMAudio.PlayOneShot(m_audioEntityId, SOUND_BOMB_TICK, 1.0f);
@@ -1476,7 +1474,7 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
FindPlayerVehicle() && FindPlayerVehicle() == m_pDamageEntity &&
m_status != STATUS_ABANDONED &&
FindPlayerVehicle()->m_vecMoveSpeed.Magnitude() >= m_vecMoveSpeed.Magnitude() &&
- FindPlayerVehicle()->m_vecMoveSpeed.Magnitude() > 0.2f)
+ FindPlayerVehicle()->m_vecMoveSpeed.Magnitude() > 0.1f)
FindPlayerPed()->SetWantedLevelNoDrop(1);
if(m_status == STATUS_PLAYER && impulse > 50.0f){