mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 14:00:02 +00:00
fixed sound enum
This commit is contained in:
parent
764af8735c
commit
7da4f7fc35
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue