From 9a50a59a3ced80d782ac1b89aed1e5e86a91dd64 Mon Sep 17 00:00:00 2001 From: aap Date: Fri, 26 Jul 2019 14:27:13 +0200 Subject: CAutomobile::FireTruckControl and HydraulicControl --- src/audio/DMAudio.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/audio') diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index da20dc31..4428c958 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -20,9 +20,9 @@ enum eSound : int16 SOUND_F = 15, SOUND_CAR_ENGINE_START = 16, SOUND_CAR_LIGHT_BREAK = 17, - SOUND_CAR_HYDRALIC_1 = 18, - SOUND_CAR_HYDRALIC_2 = 19, - SOUND_CAR_HYDRALIC_3 = 20, + SOUND_CAR_HYDRAULIC_1 = 18, + SOUND_CAR_HYDRAULIC_2 = 19, + SOUND_CAR_HYDRAULIC_3 = 20, SOUND_CAR_JERK = 21, SOUND_CAR_SPLASH = 22, SOUND_17 = 23, -- cgit v1.2.3 From efdd44cd685cb1f8384da175f97993acfc0660a3 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Fri, 26 Jul 2019 18:01:56 +0300 Subject: fixed bridge --- src/audio/AudioManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio') diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index c0479002..dfecafb2 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -4037,7 +4037,7 @@ cAudioManager::ProcessEntity(int32 id) case AUDIOTYPE_BRIDGE: if(!m_bUserPause) { m_sQueueSample.m_bReverbFlag = 1; - cAudioManager::ProcessBridgeOneShots(); + cAudioManager::ProcessBridge(); } break; case AUDIOTYPE_FRONTEND: -- cgit v1.2.3 From 8102ace7b67dcf8d511a708072f6f032120df949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Sun, 28 Jul 2019 20:39:39 +0300 Subject: Peds, mainly audio --- src/audio/DMAudio.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/audio') diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index 4428c958..907755b9 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -35,18 +35,18 @@ enum eSound : int16 SOUND_STEP_END = 30, SOUND_FALL_LAND = 31, SOUND_FALL_COLLAPSE = 32, - SOUND_21 = 33, - SOUND_22 = 34, - SOUND_23 = 35, - SOUND_24 = 36, - SOUND_25 = 37, - SOUND_26 = 38, - SOUND_WEAPON_PUNCH_ATTACK = 39, - SOUND_28 = 40, - SOUND_29 = 41, - SOUND_2A = 42, - SOUND_2B = 43, - SOUND_2C = 44, + SOUND_FIGHT_PUNCH_33 = 33, + SOUND_FIGHT_KICK_34 = 34, + SOUND_FIGHT_HEADBUTT_35 = 35, + SOUND_FIGHT_PUNCH_36 = 36, + SOUND_FIGHT_PUNCH_37 = 37, + SOUND_FIGHT_CLOSE_PUNCH_38 = 38, + SOUND_FIGHT_PUNCH_39 = 39, + SOUND_FIGHT_PUNCH_OR_KICK_BELOW_40 = 40, + SOUND_FIGHT_PUNCH_41 = 41, + SOUND_FIGHT_PUNCH_FROM_BEHIND_42 = 42, + SOUND_FIGHT_KNEE_OR_KICK_43 = 43, + SOUND_FIGHT_KICK_44 = 44, SOUND_2D = 45, SOUND_WEAPON_BAT_ATTACK = 46, SOUND_WEAPON_SHOT_FIRED = 47, -- cgit v1.2.3