summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-08-24 21:36:03 +0200
committereray orçunus <erayorcunus@gmail.com>2020-08-24 21:36:03 +0200
commitcb813bd1abdf7758a7893c354de6d9f81291c6cf (patch)
tree7639d3175c889f0e2469308d62e3d25ae6f32b4b /src/vehicles
parentRevert "remove CFO" (diff)
parentsmall fix (diff)
downloadre3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.tar
re3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.tar.gz
re3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.tar.bz2
re3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.tar.lz
re3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.tar.xz
re3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.tar.zst
re3-cb813bd1abdf7758a7893c354de6d9f81291c6cf.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Automobile.cpp6
-rw-r--r--src/vehicles/Boat.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index d2fedbd5..66452477 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -3413,7 +3413,7 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
m_fHealth -= bTakeLessDamage ? damage/6.0f : damage/2.0f;
}else{
if(damage > 35.0f && pDriver)
- pDriver->Say(SOUND_PED_CAR_COLLISION);
+ pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
m_fHealth -= bTakeLessDamage ? damage/12.0f : damage/4.0f;
}
if(m_fHealth <= 0.0f && oldHealth > 0)
@@ -4047,11 +4047,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);
}
}
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp
index 50117690..c248b54c 100644
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -197,7 +197,7 @@ CBoat::ProcessControl(void)
m_fHealth -= (collisionDamage-25.0f)/2.0f;
}else{
if(collisionDamage > 60.0f && pDriver)
- pDriver->Say(SOUND_PED_CAR_COLLISION);
+ pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
if(bTakeLessDamage)
m_fHealth -= (collisionDamage-25.0f)/12.0f;
else