summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-08 23:43:52 +0100
committeraap <aap@papnet.eu>2021-01-08 23:43:52 +0100
commit49d5c02d69abaa5282906df9a8d53ea67fed69c3 (patch)
treec0b673ff28f9cd61d6460475465883a2c8035bf4 /src/audio
parentMerge branch 'miami' into lcs (diff)
downloadre3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar
re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.gz
re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.bz2
re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.lz
re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.xz
re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.zst
re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/AudioLogic.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 53483ae1..c692a51b 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -4363,14 +4363,18 @@ cAudioManager::ProcessPedOneShots(cPedParams &params)
if (weaponType == WEAPONTYPE_BRASSKNUCKLE) {
CPed* ped = params.m_pPed;
uint32 fightMove = ped->m_curFightMove;
- if (fightMove == FIGHTMOVE_BACKLEFT || fightMove == FIGHTMOVE_STDPUNCH || fightMove == FIGHTMOVE_PUNCH ||
+ // LCS:removed for now
+ //if (fightMove == FIGHTMOVE_BACKLEFT || fightMove == FIGHTMOVE_STDPUNCH || fightMove == FIGHTMOVE_PUNCH ||
+ if (
ped->m_nPedState == PED_ATTACK) {
CEntity* damageEntity = ped->m_pDamageEntity;
if (!damageEntity)
m_sQueueSample.m_nSampleIndex = m_anRandomTable[3] % 2 + SFX_HAMMER_HIT_1;
else if (damageEntity->GetType() != ENTITY_TYPE_PED)
m_sQueueSample.m_nSampleIndex = m_anRandomTable[3] % 2 + SFX_HAMMER_HIT_1;
- else if (((CPed*)damageEntity)->m_curFightMove != FIGHTMOVE_HITHEAD)
+ // LCS:removed for now
+ //else if (((CPed*)damageEntity)->m_curFightMove != FIGHTMOVE_HITHEAD)
+ else if(1)
m_sQueueSample.m_nSampleIndex = m_anRandomTable[3] % 2 + SFX_HAMMER_HIT_1;
else
m_sQueueSample.m_nSampleIndex = SFX_HAMMER_HIT_1;