summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authorFire_Head <Fire-Head@users.noreply.github.com>2020-08-27 19:35:14 +0200
committerGitHub <noreply@github.com>2020-08-27 19:35:14 +0200
commita8999bbf38cae233e39b5995118fa03bca7894ef (patch)
treeada9bd1935512f4b46fe6b4f42d9160eb2281262 /src/vehicles/Automobile.cpp
parentbike shooting fix + trace temp fix (diff)
parentupdate librw (diff)
downloadre3-a8999bbf38cae233e39b5995118fa03bca7894ef.tar
re3-a8999bbf38cae233e39b5995118fa03bca7894ef.tar.gz
re3-a8999bbf38cae233e39b5995118fa03bca7894ef.tar.bz2
re3-a8999bbf38cae233e39b5995118fa03bca7894ef.tar.lz
re3-a8999bbf38cae233e39b5995118fa03bca7894ef.tar.xz
re3-a8999bbf38cae233e39b5995118fa03bca7894ef.tar.zst
re3-a8999bbf38cae233e39b5995118fa03bca7894ef.zip
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r--src/vehicles/Automobile.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index e06ce03b..eec44c35 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -49,7 +49,7 @@
#include "Object.h"
#include "Automobile.h"
-//--MIAMI: file done except TODOs
+//--MIAMI: file done
bool bAllCarCheat;
@@ -154,7 +154,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
m_fElasticity = 0.05f;
m_fBuoyancy = pHandling->fBuoyancy;
- m_fOrientation = m_auto_unk4 = 0.0f;
+ m_fOrientation = m_fPlaneSteer = 0.0f;
m_nBusDoorTimerEnd = 0;
m_nBusDoorTimerStart = 0;
@@ -4210,12 +4210,11 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
pDriver &&
m_pDamageEntity && m_pDamageEntity->IsVehicle() &&
(this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) &&
-// TODO(MIAMI): enum
((CVehicle*)m_pDamageEntity)->pDriver){
if(GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR)
- pDriver->Say(145);
+ pDriver->Say(SOUND_PED_CRASH_CAR);
else
- pDriver->Say(144);
+ pDriver->Say(SOUND_PED_CRASH_VEHICLE);
}
int oldHealth = m_fHealth;
@@ -4944,11 +4943,11 @@ CAutomobile::PlayCarHorn(void)
m_nCarHornTimer = 45;
}else if(r < 4){
if(pDriver)
- pDriver->Say(SOUND_PED_CAR_COLLISION);
+ pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
m_nCarHornTimer = 45;
}else{
if(pDriver)
- pDriver->Say(SOUND_PED_CAR_COLLISION);
+ pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
}
}