summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.cpp
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2019-12-06 00:11:17 +0100
committerGitHub <noreply@github.com>2019-12-06 00:11:17 +0100
commitd1141f468ca5c22debc6280c560bdd47fbf5998c (patch)
treee3c8c7402ac4e7403e904d4de9cf43c22b4b0e83 /src/audio/AudioManager.cpp
parentMerge pull request #278 from Fire-Head/master (diff)
parentCPhone, CPlayerInfo, CFire, CWorld (diff)
downloadre3-d1141f468ca5c22debc6280c560bdd47fbf5998c.tar
re3-d1141f468ca5c22debc6280c560bdd47fbf5998c.tar.gz
re3-d1141f468ca5c22debc6280c560bdd47fbf5998c.tar.bz2
re3-d1141f468ca5c22debc6280c560bdd47fbf5998c.tar.lz
re3-d1141f468ca5c22debc6280c560bdd47fbf5998c.tar.xz
re3-d1141f468ca5c22debc6280c560bdd47fbf5998c.tar.zst
re3-d1141f468ca5c22debc6280c560bdd47fbf5998c.zip
Diffstat (limited to 'src/audio/AudioManager.cpp')
-rw-r--r--src/audio/AudioManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index f823cf19..abfbde00 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -5536,12 +5536,12 @@ cAudioManager::ProcessPedHeadphones(cPedParams *params)
if(params->m_fDistance < 49.f) {
ped = params->m_pPed;
- if(!ped->bIsAimingGun || ped->m_bodyPartBleeding != 2) {
+ if(!ped->bIsAimingGun || ped->m_bodyPartBleeding != PED_HEAD) {
CalculateDistance(params->m_bDistanceCalculated, params->m_fDistance);
if(ped->bInVehicle && ped->m_nPedState == PED_DRIVING) {
emittingVol = 10;
veh = ped->m_pMyVehicle;
- if(veh && veh->m_type == 0) {
+ if(veh && veh->IsCar()) {
for(int32 i = 2; i < 6; i++) {
if(!veh->IsDoorClosed((eDoors)i) || veh->IsDoorMissing((eDoors)i)) {
emittingVol = 42;
@@ -6451,7 +6451,7 @@ cAudioManager::ProcessPhysical(int32 id)
{
CPhysical *entity = (CPhysical *)m_asAudioEntities[id].m_pEntity;
if(entity) {
- switch(entity->m_type & 7) {
+ switch(entity->m_type) {
case ENTITY_TYPE_VEHICLE: ProcessVehicle((CVehicle *)m_asAudioEntities[id].m_pEntity); break;
case ENTITY_TYPE_PED: ProcessPed((CPhysical *)m_asAudioEntities[id].m_pEntity); break;
default: return;