mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-26 18:15:27 +00:00
Code Issues Projects Releases Wiki Activity

fixed sound enum

Browse source
This commit is contained in:
aap 2020-08-20 13:20:48 +02:00
parent 764af8735c
commit 7da4f7fc35
5 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/audio/soundlist.h
View file

@ -146,9 +146,9 @@ enum eSound : uint16
SOUND_PED_LEAVE_VEHICLE, SOUND_PED_LEAVE_VEHICLE,
SOUND_PED_EVADE, SOUND_PED_EVADE,
SOUND_PED_FLEE_RUN, SOUND_PED_FLEE_RUN,
SOUND_PED_CAR_COLLISION, SOUND_PED_CRASH_VEHICLE,
SOUND_PED_BOAT_COLLISION, SOUND_PED_CRASH_CAR,
SOUND_PED_HORN_ACTIVE, SOUND_PED_ANNOYED_DRIVER,
SOUND_PED_147, SOUND_PED_147,
SOUND_PED_SOLICIT, SOUND_PED_SOLICIT,
SOUND_PED_149, SOUND_PED_149,

6
src/peds/PedChat.cpp
View file

@ -131,9 +131,9 @@ CPed::Say(uint16 audio)
case SOUND_PED_FLEE_SPRINT: case SOUND_PED_FLEE_SPRINT:
case SOUND_PED_TAXI_WAIT: case SOUND_PED_TAXI_WAIT:
case SOUND_PED_EVADE: case SOUND_PED_EVADE:
case SOUND_PED_CAR_COLLISION: case SOUND_PED_CRASH_VEHICLE:
case SOUND_PED_BOAT_COLLISION: case SOUND_PED_CRASH_CAR:
case SOUND_PED_HORN_ACTIVE: case SOUND_PED_ANNOYED_DRIVER:
break; break;
default: default:
return; return;

11
src/vehicles/Automobile.cpp
View file

@ -49,7 +49,7 @@
#include "Object.h" #include "Object.h"
#include "Automobile.h" #include "Automobile.h"
//--MIAMI: file done except TODOs //--MIAMI: file done
bool bAllCarCheat; bool bAllCarCheat;
@ -4210,12 +4210,11 @@ CAutomobile::VehicleDamage(float impulse, uint16 damagedPiece)
pDriver && pDriver &&
m_pDamageEntity && m_pDamageEntity->IsVehicle() && m_pDamageEntity && m_pDamageEntity->IsVehicle() &&
(this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) && (this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) &&
// TODO(MIAMI): enum
((CVehicle*)m_pDamageEntity)->pDriver){ ((CVehicle*)m_pDamageEntity)->pDriver){
if(GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR) if(GetVehicleAppearance() == VEHICLE_APPEARANCE_CAR)
pDriver->Say(145); pDriver->Say(SOUND_PED_CRASH_CAR);
else else
pDriver->Say(144); pDriver->Say(SOUND_PED_CRASH_VEHICLE);
} }
int oldHealth = m_fHealth; int oldHealth = m_fHealth;
@ -4944,11 +4943,11 @@ CAutomobile::PlayCarHorn(void)
m_nCarHornTimer = 45; m_nCarHornTimer = 45;
}else if(r < 4){ }else if(r < 4){
if(pDriver) if(pDriver)
pDriver->Say(SOUND_PED_CAR_COLLISION); pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
m_nCarHornTimer = 45; m_nCarHornTimer = 45;
}else{ }else{
if(pDriver) if(pDriver)
pDriver->Say(SOUND_PED_CAR_COLLISION); pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
} }
} }

9
src/vehicles/Bike.cpp
View file

@ -37,7 +37,7 @@
#include "Bike.h" #include "Bike.h"
#include "Debug.h" #include "Debug.h"
//--MIAMI: done except for TODOs //--MIAMI: file done
// TODO: maybe put this somewhere else // TODO: maybe put this somewhere else
inline void inline void
@ -2134,8 +2134,7 @@ CBike::VehicleDamage(void)
m_pDamageEntity && m_pDamageEntity->IsVehicle() && m_pDamageEntity && m_pDamageEntity->IsVehicle() &&
(this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) && (this != FindPlayerVehicle() || ((CVehicle*)m_pDamageEntity)->VehicleCreatedBy == MISSION_VEHICLE) &&
((CVehicle*)m_pDamageEntity)->pDriver) ((CVehicle*)m_pDamageEntity)->pDriver)
// TODO(MIAMI): enum pDriver->Say(SOUND_PED_CRASH_VEHICLE);
pDriver->Say(144);
int oldHealth = m_fHealth; int oldHealth = m_fHealth;
if(this == FindPlayerVehicle()) if(this == FindPlayerVehicle())
@ -2542,11 +2541,11 @@ CBike::PlayCarHorn(void)
m_nCarHornTimer = 45; m_nCarHornTimer = 45;
}else if(r < 4){ }else if(r < 4){
if(pDriver) if(pDriver)
pDriver->Say(SOUND_PED_CAR_COLLISION); pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
m_nCarHornTimer = 45; m_nCarHornTimer = 45;
}else{ }else{
if(pDriver) if(pDriver)
pDriver->Say(SOUND_PED_CAR_COLLISION); pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
} }
} }

2
src/vehicles/Boat.cpp
View file

@ -242,7 +242,7 @@ CBoat::ProcessControl(void)
m_fHealth -= (collisionDamage-25.0f)/2.0f; m_fHealth -= (collisionDamage-25.0f)/2.0f;
}else{ }else{
if(collisionDamage > 60.0f && pDriver) if(collisionDamage > 60.0f && pDriver)
pDriver->Say(SOUND_PED_CAR_COLLISION); pDriver->Say(SOUND_PED_ANNOYED_DRIVER);
if(bTakeLessDamage) if(bTakeLessDamage)
m_fHealth -= (collisionDamage-25.0f)/12.0f; m_fHealth -= (collisionDamage-25.0f)/12.0f;
else else