summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-20 13:20:48 +0200
committeraap <aap@papnet.eu>2020-08-20 13:20:48 +0200
commit7da4f7fc35196381f94331dbfeb2812e3af7eda7 (patch)
tree2e9ae96a83991e932c9e9d189d47473e2b4ba0e9 /src/vehicles/Automobile.cpp
parentrw stuff done & other small things (diff)
downloadre3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.tar
re3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.tar.gz
re3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.tar.bz2
re3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.tar.lz
re3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.tar.xz
re3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.tar.zst
re3-7da4f7fc35196381f94331dbfeb2812e3af7eda7.zip
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r--src/vehicles/Automobile.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 44e0b044..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;
@@ -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);
}
}