summaryrefslogtreecommitdiffstats
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
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 '')
-rw-r--r--src/audio/soundlist.h6
-rw-r--r--src/peds/PedChat.cpp6
-rw-r--r--src/vehicles/Automobile.cpp11
-rw-r--r--src/vehicles/Bike.cpp9
-rw-r--r--src/vehicles/Boat.cpp2
5 files changed, 16 insertions, 18 deletions
diff --git a/src/audio/soundlist.h b/src/audio/soundlist.h
index 2a5b83cf..bc9ac09a 100644
--- a/src/audio/soundlist.h
+++ b/src/audio/soundlist.h
@@ -146,9 +146,9 @@ enum eSound : uint16
SOUND_PED_LEAVE_VEHICLE,
SOUND_PED_EVADE,
SOUND_PED_FLEE_RUN,
- SOUND_PED_CAR_COLLISION,
- SOUND_PED_BOAT_COLLISION,
- SOUND_PED_HORN_ACTIVE,
+ SOUND_PED_CRASH_VEHICLE,
+ SOUND_PED_CRASH_CAR,
+ SOUND_PED_ANNOYED_DRIVER,
SOUND_PED_147,
SOUND_PED_SOLICIT,
SOUND_PED_149,
diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp
index 4480a8cd..73a8e59c 100644
--- a/src/peds/PedChat.cpp
+++ b/src/peds/PedChat.cpp
@@ -131,9 +131,9 @@ CPed::Say(uint16 audio)
case SOUND_PED_FLEE_SPRINT:
case SOUND_PED_TAXI_WAIT:
case SOUND_PED_EVADE:
- case SOUND_PED_CAR_COLLISION:
- case SOUND_PED_BOAT_COLLISION:
- case SOUND_PED_HORN_ACTIVE:
+ case SOUND_PED_CRASH_VEHICLE:
+ case SOUND_PED_CRASH_CAR:
+ case SOUND_PED_ANNOYED_DRIVER:
break;
default:
return;
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);
}
}
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 760a8ec6..62aeface 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -37,7 +37,7 @@
#include "Bike.h"
#include "Debug.h"
-//--MIAMI: done except for TODOs
+//--MIAMI: file done
// TODO: maybe put this somewhere else
inline void
@@ -2134,8 +2134,7 @@ CBike::VehicleDamage(void)
m_pDamageEntity && m_pDamageEntity->IsVehicle() &&
(this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) &&
((CVehicle*)m_pDamageEntity)->pDriver)
-// TODO(MIAMI): enum
- pDriver->Say(144);
+ pDriver->Say(SOUND_PED_CRASH_VEHICLE);
int oldHealth = m_fHealth;
if(this == FindPlayerVehicle())
@@ -2542,11 +2541,11 @@ CBike::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 ae437f56..086a5002 100644
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -242,7 +242,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