diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-01 14:11:12 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-01 14:11:12 +0100 |
| commit | c3f49386caf5f26f7ec0b807aa30588fc12fed94 (patch) | |
| tree | 2c7531f1dc930a054b3e3d502dc3764d542159c6 | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.tar re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.tar.gz re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.tar.bz2 re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.tar.lz re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.tar.xz re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.tar.zst re3-c3f49386caf5f26f7ec0b807aa30588fc12fed94.zip | |
| -rw-r--r-- | src/audio/AudioLogic.cpp | 4 | ||||
| -rw-r--r-- | src/peds/PedFight.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 8f03d66a..034e7a90 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -4354,7 +4354,7 @@ cAudioManager::ProcessPedOneShots(cPedParams ¶ms) m_sQueueSample.m_nFrequency = 20000; AddFightSound: { - uint32 soundParams = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i]; // wtf? stroring int as float + uint32 soundParams = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i]; // wtf? storing int as float uint8 damagerType = soundParams & 0xFF; uint32 weaponType = soundParams >> 8; @@ -4402,7 +4402,7 @@ cAudioManager::ProcessPedOneShots(cPedParams ¶ms) case SOUND_WEAPON_BAT_ATTACK: case SOUND_WEAPON_KNIFE_ATTACK: { - uint32 soundParams = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i]; // wtf? stroring int as float + uint32 soundParams = m_asAudioEntities[m_sQueueSample.m_nEntityIndex].m_afVolume[i]; // wtf? storing int as float uint8 damagerType = soundParams & 0xFF; uint32 weaponType = soundParams >> 8; if (damagerType == ENTITY_TYPE_PED) { diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index 79c6f367..9c230213 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -2021,9 +2021,9 @@ CPed::PlayHitSound(CPed *hitTo) if (weaponInfo->m_AnimToPlay == ASSOCGRP_KNIFE) { if (m_curFightMove >= FIGHTMOVE_MELEE1) { if (m_curFightMove == FIGHTMOVE_MELEE3) { - DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, (weapon << 8) | 3); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_BAT_ATTACK, (weapon << 8) | ENTITY_TYPE_PED); } else { - DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_KNIFE_ATTACK, (weapon << 8) | 3); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_KNIFE_ATTACK, (weapon << 8) | ENTITY_TYPE_PED); } return; } @@ -2048,7 +2048,7 @@ CPed::PlayHitSound(CPed *hitTo) } if (soundId != NO_SND) - DMAudio.PlayOneShot(m_audioEntityId, soundId, (weapon << 8) | 3); + DMAudio.PlayOneShot(m_audioEntityId, soundId, (weapon << 8) | ENTITY_TYPE_PED); } // --MIAMI: Done @@ -3567,7 +3567,7 @@ CPed::CollideWithPed(CPed *collideWith) animAssoc->flags |= ASSOC_FADEOUTWHENDONE; collideWith->m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 1000; if (m_nPedState == PED_ATTACK) - DMAudio.PlayOneShot(m_audioEntityId, SOUND_FIGHT_46, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_49, 0.0f); } } else { // We're at his right side |