The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2025-01-11 17:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sfx audio logic

Browse Source
This commit is contained in:
Filip Gawin 2020-10-24 18:10:51 +02:00 committed by shfil
parent ee8366adba
commit e24513d2ad
5 changed files with 3251 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2698
src/audio/AudioLogic.cpp
View File

File diff suppressed because it is too large Load Diff

108
src/audio/AudioManager.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include "audio_enums.h"
#include "AudioCollision.h"
@ -91,8 +91,8 @@ public:
m_nCommentsInBank[i] = 0;
m_nActiveBank = 0;
}
void Add(tPedComment *com);
void Process();
void Add(tPedComment *com); // done
void Process(); // done
};
VALIDATE_SIZE(cPedComments, 1164);
@ -200,7 +200,7 @@ public:
uint8 m_nPlayerMood;
uint32 m_nPlayerMoodTimer;
uint8 field_rest[4];
uint8 field_4B3C;
bool m_bGenericSfx;
cPedComments m_sPedComments;
int32 m_nFireAudioEntity;
@ -259,7 +259,101 @@ public:
// functions returning talk sfx,
// order from GetPedCommentSfx
// TODO: miami
int32 GetPlayerTalkSfx(CPed *ped, int16 sound);
int32 GetCopTalkSfx(CPed *ped, int16 sound);
int32 GetSwatTalkSfx(CPed *ped, int16 sound);
int32 GetFBITalkSfx(CPed *ped, int16 sound);
int32 GetArmyTalkSfx(CPed *ped, int16 sound);
int32 GetMedicTalkSfx(CPed *ped, int16 sound);
int32 GetFiremanTalkSfx(CPed *ped, int16 sound);
int32 GetDefaultTalkSfx(CPed *ped, int16 sound);
int32 GetHFYSTTalkSfx(CPed *ped, int16 sound);
int32 GetHFOSTTalkSfx(CPed *ped, int16 sound);
int32 GetHMYSTTalkSfx(CPed *ped, int16 sound);
int32 GetHMOSTTalkSfx(CPed *ped, int16 sound);
int32 GetHFYRITalkSfx(CPed *ped, int16 sound);
int32 GetHFORITalkSfx(CPed *ped, int16 sound);
int32 GetHMYRITalkSfx(CPed *ped, int16 sound);
int32 GetHMORITalkSfx(CPed *ped, int16 sound);
int32 GetHFYBETalkSfx(CPed *ped, int16 sound);
int32 GetHFOBETalkSfx(CPed *ped, int16 sound);
int32 GetHMYBETalkSfx(CPed *ped, int16 sound);
int32 GetHMOBETalkSfx(CPed *ped, int16 sound);
int32 GetHFYBUTalkSfx(CPed *ped, int16 sound);
int32 GetHFYMDTalkSfx(CPed *ped, int16 sound);
int32 GetHFYCGTalkSfx(CPed *ped, int16 sound);
int32 GetHFYPRTalkSfx(CPed *ped, int16 sound);
int32 GetHFOTRTalkSfx(CPed *ped, int16 sound);
int32 GetHMOTRTalkSfx(CPed *ped, int16 sound);
int32 GetHMYAPTalkSfx(CPed *ped, int16 sound);
int32 GetHMOCATalkSfx(CPed *ped, int16 sound);
int32 GetBMODKTalkSfx(CPed *ped, int16 sound);
int32 GetBMYCRTalkSfx(CPed *ped, int16 sound);
int32 GetBFYSTTalkSfx(CPed *ped, int16 sound);
int32 GetBFOSTTalkSfx(CPed *ped, int16 sound);
int32 GetBMYSTTalkSfx(CPed *ped, int16 sound);
int32 GetBMOSTTalkSfx(CPed *ped, int16 sound);
int32 GetBFYRITalkSfx(CPed *ped, int16 sound);
int32 GetBFORITalkSfx(CPed *ped, int16 sound);
int32 GetBMYRITalkSfx(CPed *ped, int16 sound);
int32 GetBFYBETalkSfx(CPed *ped, int16 sound);
int32 GetBMYBETalkSfx(CPed *ped, int16 sound);
int32 GetBFOBETalkSfx(CPed *ped, int16 sound);
int32 GetBMOBETalkSfx(CPed *ped, int16 sound);
int32 GetBMYBUTalkSfx(CPed *ped, int16 sound);
int32 GetBFYPRTalkSfx(CPed *ped, int16 sound);
int32 GetBFOTRTalkSfx(CPed *ped, int16 sound);
int32 GetBMOTRTalkSfx(CPed *ped, int16 sound);
int32 GetBMYPITalkSfx(CPed *ped, int16 sound);
int32 GetBMYBBTalkSfx(CPed *ped, int16 sound);
int32 GetWMYCRTalkSfx(CPed *ped, int16 sound);
int32 GetWFYSTTalkSfx(CPed *ped, int16 sound);
int32 GetWFOSTTalkSfx(CPed *ped, int16 sound);
int32 GetWMYSTTalkSfx(CPed *ped, int16 sound);
int32 GetWMOSTTalkSfx(CPed *ped, int16 sound);
int32 GetWFYRITalkSfx(CPed *ped, int16 sound);
int32 GetWFORITalkSfx(CPed *ped, int16 sound);
int32 GetWMYRITalkSfx(CPed *ped, int16 sound);
int32 GetWMORITalkSfx(CPed *ped, int16 sound);
int32 GetWFYBETalkSfx(CPed *ped, int16 sound);
int32 GetWMYBETalkSfx(CPed *ped, int16 sound);
int32 GetWFOBETalkSfx(CPed *ped, int16 sound);
int32 GetWMOBETalkSfx(CPed *ped, int16 sound);
int32 GetWMYCWTalkSfx(CPed *ped, int16 sound);
int32 GetWMYGOTalkSfx(CPed *ped, int16 sound);
int32 GetWFOGOTalkSfx(CPed *ped, int16 sound);
int32 GetWMOGOTalkSfx(CPed *ped, int16 sound);
int32 GetWFYLGTalkSfx(CPed *ped, int16 sound);
int32 GetWMYLGTalkSfx(CPed *ped, int16 sound);
int32 GetWFYBUTalkSfx(CPed *ped, int16 sound);
int32 GetWMYBUTalkSfx(CPed *ped, int16 sound);
int32 GetWMOBUTalkSfx(CPed *ped, int16 sound);
int32 GetWFYPRTalkSfx(CPed *ped, int16 sound);
int32 GetWFOTRTalkSfx(CPed *ped, int16 sound);
int32 GetWMOTRTalkSfx(CPed *ped, int16 sound);
int32 GetWMYPITalkSfx(CPed *ped, int16 sound);
int32 GetWMOCATalkSfx(CPed *ped, int16 sound);
int32 GetWFYJGTalkSfx(CPed *ped, int16 sound);
int32 GetWMYJGTalkSfx(CPed *ped, int16 sound);
int32 GetWFYSKTalkSfx(CPed *ped, int16 sound);
int32 GetWMYSKTalkSfx(CPed *ped, int16 sound);
int32 GetWFYSHTalkSfx(CPed *ped, int16 sound);
int32 GetWFOSHTalkSfx(CPed *ped, int16 sound);
int32 GetJFOTOTalkSfx(CPed *ped, int16 sound);
int32 GetJMOTOTalkSfx(CPed *ped, int16 sound);
int32 GetCBTalkSfx(CPed *ped, int16 sound);
int32 GetHNTalkSfx(CPed *ped, int16 sound);
int32 GetSGTalkSfx(CPed *ped, int16 sound);
int32 GetCLTalkSfx(CPed *ped, int16 sound);
int32 GetGDTalkSfx(CPed *ped, int16 sound);
int32 GetBKTalkSfx(CPed *ped, int16 sound);
int32 GetPGTalkSfx(CPed *ped, int16 sound);
int32 GetVICETalkSfx(CPed *ped, int16 sound, int16 model);
int32 GetWFYG1TalkSfx(CPed *ped, int16 sound);
int32 GetWFYG2TalkSfx(CPed *ped, int16 sound);
int32 GetGenericMaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc)
int32 GetGenericFemaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc)
// end of functions returning talk sfx
void GenerateIntegerRandomNumberTable();
@ -276,7 +370,7 @@ public:
int8 GetMissionScriptPoliceAudioPlayingStatus() const;
uint8 GetNum3DProvidersAvailable() const; // done
int32 GetPedCommentSfx(CPed *ped, int32 sound);
void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset) const;
void GetPhrase(int32 *phrase, int32 *prevPhrase, int32 sample, int32 maxOffset) const;
float GetVehicleDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
float GetVehicleNonDriveWheelSkidValue(uint8 wheel, CAutomobile *automobile, cTransmission *transmission, float velocityChange);
@ -402,7 +496,7 @@ public:
bool SetupJumboRumbleSound(uint8 emittingVol);
bool SetupJumboTaxiSound(uint8 vol);
bool SetupJumboWhineSound(uint8 emittingVol, uint32 freq);
void SetupPedComments(cPedParams *params, uint32 sound);
void SetupPedComments(cPedParams *params, uint32 sound); // done
void SetupSuspectLastSeenReport();
void Terminate();

238
src/audio/AudioSamples.h
View File

@ -1,9 +1,8 @@
#pragma once
#pragma once
#include "common.h"
enum eSfxSample : uint32
{
enum eSfxSample : uint32 {
SFX_CAR_HORN_JEEP = 0,
SFX_CAR_HORN_BMW328,
SFX_CAR_HORN_BUS,
@ -576,6 +575,239 @@ enum eSfxSample : uint32
SFX_FOOTSTEP_SAND_4,
// TODO: miami ped comments... THERE'S OVER 9000
SFX_VCPA_1 = 714,
SFX_VCPA_2 = 715,
SFX_VCPA_3 = 716,
SFX_VCPA_4 = 717,
SFX_VCPA_5 = 718,
SFX_VCPA_6 = 719,
SFX_VCPA_7 = 720,
SFX_VCPA_8 = 721,
SFX_VCPA_9 = 722,
SFX_VCPA_10 = 723,
SFX_VCPA_11 = 724,
SFX_VCPA_12 = 725,
SFX_VCPA_13 = 726,
SFX_VCPA_14 = 727,
SFX_VCPA_15 = 728,
SFX_VCPA_16 = 729,
SFX_VCPA_17 = 730,
SFX_VCPA_18 = 731,
SFX_VCPA_19 = 732,
SFX_VCPA_20 = 733,
SFX_VCPA_21 = 734,
SFX_VCPA_22 = 735,
SFX_VCPA_23 = 736,
SFX_VCPA_24 = 737, // huh?
SFX_VCPA_25 = 738,
SFX_VCPA_26 = 739,
SFX_VCPA_27 = 740,
SFX_VCPA_28 = 741,
SFX_VCPA_29 = 742,
SFX_POLICE_HELI_1 = 737,
SFX_POLICE_HELI_2 = 738,
SFX_POLICE_HELI_3 = 739,
SFX_POLICE_HELI_4 = 740,
SFX_POLICE_HELI_5 = 741,
SFX_POLICE_HELI_6 = 742,
SFX_POLICE_HELI_7 = 743,
SFX_POLICE_HELI_8 = 744,
SFX_POLICE_HELI_9 = 745,
SFX_POLICE_HELI_10 = 746,
SFX_POLICE_HELI_11 = 747,
SFX_POLICE_HELI_12 = 748,
SFX_POLICE_HELI_13 = 749,
SFX_POLICE_HELI_14 = 750,
SFX_POLICE_HELI_15 = 751,
SFX_POLICE_HELI_16 = 752,
SFX_POLICE_HELI_17 = 753,
SFX_POLICE_HELI_18 = 754,
SFX_POLICE_HELI_19 = 755,
SFX_POLICE_HELI_20 = 756,
SFX_GENERIC_FEMALE_GRUNT_1 = 2953,
SFX_GENERIC_FEMALE_GRUNT_2 = 2954,
SFX_GENERIC_FEMALE_GRUNT_3 = 2955,
SFX_GENERIC_FEMALE_GRUNT_4 = 2956,
SFX_GENERIC_FEMALE_GRUNT_5 = 2957,
SFX_GENERIC_FEMALE_GRUNT_6 = 2958,
SFX_GENERIC_FEMALE_GRUNT_7 = 2959,
SFX_GENERIC_FEMALE_GRUNT_8 = 2960,
SFX_GENERIC_FEMALE_GRUNT_9 = 2961,
SFX_GENERIC_FEMALE_GRUNT_10 = 2962,
SFX_GENERIC_FEMALE_GRUNT_11 = 2963,
SFX_GENERIC_FEMALE_GRUNT_12 = 2964,
SFX_GENERIC_FEMALE_GRUNT_13 = 2965,
SFX_GENERIC_FEMALE_GRUNT_14 = 2966,
SFX_GENERIC_FEMALE_GRUNT_15 = 2967,
SFX_GENERIC_FEMALE_GRUNT_16 = 2968,
SFX_GENERIC_FEMALE_GRUNT_17 = 2969,
SFX_GENERIC_FEMALE_GRUNT_18 = 2970,
SFX_GENERIC_FEMALE_GRUNT_19 = 2971,
SFX_GENERIC_FEMALE_GRUNT_20 = 2972,
SFX_GENERIC_FEMALE_GRUNT_21 = 2973,
SFX_GENERIC_FEMALE_GRUNT_22 = 2974,
SFX_GENERIC_FEMALE_GRUNT_23 = 2975,
SFX_GENERIC_FEMALE_GRUNT_24 = 2976,
SFX_GENERIC_FEMALE_GRUNT_25 = 2977,
SFX_GENERIC_FEMALE_GRUNT_26 = 2978,
SFX_GENERIC_FEMALE_GRUNT_27 = 2979,
SFX_GENERIC_FEMALE_GRUNT_28 = 2980,
SFX_GENERIC_FEMALE_GRUNT_29 = 2981,
SFX_GENERIC_FEMALE_GRUNT_30 = 2982,
SFX_GENERIC_FEMALE_GRUNT_31 = 2983,
SFX_GENERIC_FEMALE_GRUNT_32 = 2984,
SFX_GENERIC_FEMALE_GRUNT_33 = 2985,
SFX_GENERIC_MALE_FIRE_1 = 3013,
SFX_GENERIC_MALE_FIRE_2 = 3014,
SFX_GENERIC_MALE_FIRE_3 = 3015,
SFX_GENERIC_MALE_FIRE_4 = 3016,
SFX_GENERIC_MALE_FIRE_5 = 3017,
SFX_GENERIC_MALE_FIRE_6 = 3018,
SFX_GENERIC_MALE_FIRE_7 = 3019,
SFX_GENERIC_MALE_FIRE_8 = 3020,
SFX_GENERIC_MALE_FIRE_9 = 3021,
SFX_GENERIC_MALE_FIRE_10 = 3022,
SFX_GENERIC_MALE_FIRE_11 = 3023,
SFX_GENERIC_MALE_FIRE_12 = 3024,
SFX_GENERIC_MALE_FIRE_13 = 3025,
SFX_GENERIC_MALE_FIRE_14 = 3026,
SFX_GENERIC_MALE_FIRE_15 = 3027,
SFX_GENERIC_MALE_FIRE_16 = 3028,
SFX_GENERIC_MALE_FIRE_17 = 3029,
SFX_GENERIC_MALE_FIRE_18 = 3030,
SFX_GENERIC_MALE_FIRE_19 = 3031,
SFX_GENERIC_MALE_FIRE_20 = 3032,
SFX_GENERIC_MALE_FIRE_21 = 3033,
SFX_GENERIC_MALE_FIRE_22 = 3034,
SFX_GENERIC_MALE_FIRE_23 = 3035,
SFX_GENERIC_MALE_FIRE_24 = 3036,
SFX_GENERIC_MALE_FIRE_25 = 3037,
SFX_GENERIC_MALE_FIRE_26 = 3038,
SFX_GENERIC_MALE_FIRE_27 = 3039,
SFX_GENERIC_MALE_FIRE_28 = 3040,
SFX_GENERIC_MALE_FIRE_29 = 3041,
SFX_GENERIC_MALE_FIRE_30 = 3042,
SFX_GENERIC_MALE_FIRE_31 = 3043,
SFX_GENERIC_MALE_FIRE_32 = 3044,
SFX_GENERIC_MALE_DEATH_1 = 3045,
SFX_GENERIC_MALE_DEATH_2 = 3046,
SFX_GENERIC_MALE_DEATH_3 = 3047,
SFX_GENERIC_MALE_DEATH_4 = 3048,
SFX_GENERIC_MALE_DEATH_5 = 3049,
SFX_GENERIC_MALE_DEATH_6 = 3050,
SFX_GENERIC_MALE_DEATH_7 = 3051,
SFX_GENERIC_MALE_DEATH_8 = 3052,
SFX_GENERIC_MALE_DEATH_9 = 3053,
SFX_GENERIC_MALE_DEATH_10 = 3054,
SFX_GENERIC_MALE_DEATH_11 = 3055,
SFX_GENERIC_MALE_DEATH_12 = 3056,
SFX_GENERIC_MALE_DEATH_13 = 3057,
SFX_GENERIC_MALE_DEATH_14 = 3058,
SFX_GENERIC_MALE_DEATH_15 = 3059,
SFX_GENERIC_MALE_DEATH_16 = 3060,
SFX_GENERIC_MALE_DEATH_17 = 3061,
SFX_GENERIC_MALE_DEATH_18 = 3062,
SFX_GENERIC_MALE_DEATH_19 = 3063,
SFX_GENERIC_MALE_DEATH_20 = 3064,
SFX_GENERIC_MALE_DEATH_21 = 3065,
SFX_GENERIC_MALE_DEATH_22 = 3066,
SFX_GENERIC_MALE_DEATH_23 = 3067,
SFX_GENERIC_MALE_DEATH_24 = 3068,
SFX_GENERIC_MALE_DEATH_25 = 3069,
SFX_GENERIC_MALE_DEATH_26 = 3070,
SFX_GENERIC_MALE_DEATH_27 = 3071,
SFX_GENERIC_MALE_DEATH_28 = 3072,
SFX_GENERIC_MALE_DEATH_29 = 3073,
SFX_GENERIC_MALE_DEATH_30 = 3074,
SFX_GENERIC_MALE_DEATH_31 = 3075,
SFX_GENERIC_MALE_DEATH_32 = 3076,
SFX_GENERIC_MALE_DEATH_33 = 3077,
SFX_GENERIC_MALE_DEATH_34 = 3078,
SFX_GENERIC_MALE_DEATH_35 = 3079,
SFX_GENERIC_MALE_DEATH_36 = 3080,
SFX_GENERIC_MALE_DEATH_37 = 3081,
SFX_GENERIC_MALE_DEATH_38 = 3082,
SFX_GENERIC_MALE_DEATH_39 = 3083,
SFX_GENERIC_MALE_DEATH_40 = 3084,
SFX_GENERIC_MALE_DEATH_41 = 3085,
SFX_GENERIC_MALE_GRUNT_1 = 3086,
SFX_GENERIC_MALE_GRUNT_2 = 3087,
SFX_GENERIC_MALE_GRUNT_3 = 3088,
SFX_GENERIC_MALE_GRUNT_4 = 3089,
SFX_GENERIC_MALE_GRUNT_5 = 3090,
SFX_GENERIC_MALE_GRUNT_6 = 3091,
SFX_GENERIC_MALE_GRUNT_7 = 3092,
SFX_GENERIC_MALE_GRUNT_8 = 3093,
SFX_GENERIC_MALE_GRUNT_9 = 3094,
SFX_GENERIC_MALE_GRUNT_10 = 3095,
SFX_GENERIC_MALE_GRUNT_11 = 3096,
SFX_GENERIC_MALE_GRUNT_12 = 3097,
SFX_GENERIC_MALE_GRUNT_13 = 3098,
SFX_GENERIC_MALE_GRUNT_14 = 3099,
SFX_GENERIC_MALE_GRUNT_15 = 3100,
SFX_GENERIC_MALE_GRUNT_16 = 3101,
SFX_GENERIC_MALE_GRUNT_17 = 3102,
SFX_GENERIC_MALE_GRUNT_18 = 3103,
SFX_GENERIC_MALE_GRUNT_19 = 3104,
SFX_GENERIC_MALE_GRUNT_20 = 3105,
SFX_GENERIC_MALE_GRUNT_21 = 3106,
SFX_GENERIC_MALE_GRUNT_22 = 3107,
SFX_GENERIC_MALE_GRUNT_23 = 3108,
SFX_GENERIC_MALE_GRUNT_24 = 3109,
SFX_GENERIC_MALE_GRUNT_25 = 3110,
SFX_GENERIC_MALE_GRUNT_26 = 3111,
SFX_GENERIC_MALE_GRUNT_27 = 3112,
SFX_GENERIC_MALE_GRUNT_28 = 3113,
SFX_GENERIC_MALE_GRUNT_29 = 3114,
SFX_GENERIC_MALE_GRUNT_30 = 3115,
SFX_GENERIC_MALE_GRUNT_31 = 3116,
SFX_GENERIC_MALE_GRUNT_32 = 3117,
SFX_GENERIC_MALE_GRUNT_33 = 3118,
SFX_GENERIC_MALE_GRUNT_34 = 3119,
SFX_GENERIC_MALE_GRUNT_35 = 3120,
SFX_GENERIC_MALE_GRUNT_36 = 3121,
SFX_GENERIC_MALE_GRUNT_37 = 3122,
SFX_GENERIC_MALE_GRUNT_38 = 3123,
SFX_GENERIC_MALE_GRUNT_39 = 3124,
SFX_GENERIC_MALE_GRUNT_40 = 3125,
SFX_GENERIC_MALE_GRUNT_41 = 3126,
SFX_GENERIC_MALE_PANIC_1 = 3127,
SFX_GENERIC_MALE_PANIC_2 = 3128,
SFX_GENERIC_MALE_PANIC_3 = 3129,
SFX_GENERIC_MALE_PANIC_4 = 3130,
SFX_GENERIC_MALE_PANIC_5 = 3131,
SFX_GENERIC_MALE_PANIC_6 = 3132,
SFX_GENERIC_MALE_PANIC_7 = 3133,
SFX_GENERIC_MALE_PANIC_8 = 3134,
SFX_GENERIC_MALE_PANIC_9 = 3135,
SFX_GENERIC_MALE_PANIC_10 = 3136,
SFX_GENERIC_MALE_PANIC_11 = 3137,
SFX_GENERIC_MALE_PANIC_12 = 3138,
SFX_GENERIC_MALE_PANIC_13 = 3139,
SFX_GENERIC_MALE_PANIC_14 = 3140,
SFX_GENERIC_MALE_PANIC_15 = 3141,
SFX_GENERIC_MALE_PANIC_16 = 3142,
SFX_GENERIC_MALE_PANIC_17 = 3143,
SFX_GENERIC_MALE_PANIC_18 = 3144,
SFX_GENERIC_MALE_PANIC_19 = 3145,
SFX_GENERIC_MALE_PANIC_20 = 3146,
SFX_GENERIC_MALE_PANIC_21 = 3147,
SFX_GENERIC_MALE_PANIC_22 = 3148,
SFX_GENERIC_MALE_PANIC_23 = 3149,
SFX_GENERIC_MALE_PANIC_24 = 3150,
SFX_GENERIC_MALE_PANIC_25 = 3151,
SFX_GENERIC_MALE_PANIC_26 = 3152,
SFX_GENERIC_MALE_PANIC_27 = 3153,
SFX_GENERIC_MALE_PANIC_28 = 3154,
SFX_GENERIC_MALE_PANIC_29 = 3155,
SFX_GENERIC_MALE_PANIC_30 = 3156,
SFX_GENERIC_MALE_PANIC_31 = 3157,
SFX_GENERIC_MALE_PANIC_32 = 3158,
SFX_GENERIC_MALE_PANIC_33 = 3159,
SFX_GENERIC_MALE_PANIC_34 = 3160,
SFX_GENERIC_MALE_PANIC_35 = 3161,
TOTAL_AUDIO_SAMPLES = 9941,
NO_SAMPLE,

6
src/audio/soundlist.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
enum eSound : uint16
{
@ -116,8 +116,8 @@ enum eSound : uint16
SOUND_PED_MIAMIVICE_EXITING_CAR,
SOUND_PED_COP_HELIPILOTPHRASE,
SOUND_PED_PULLOUTWEAPON,
SOUND_PED_HELI_PLAYER_FOUND,
SOUND_115,
SOUND_PED_HELI_PLAYER_FOUND = 114,
SOUND_PED_VCPA_PLAYER_FOUND = 115,
SOUND_PED_ON_FIRE,
SOUND_PED_AIMING,
SOUND_PED_HANDS_UP,

4
src/vehicles/Boat.cpp
View File

@ -1,4 +1,4 @@
#include "common.h"
#include "common.h"
#include "General.h"
#include "Timecycle.h"
@ -145,7 +145,7 @@ CBoat::ProcessControl(void)
AutoPilot.m_nCarMission == MISSION_BLOCKPLAYER_CLOSE ||
AutoPilot.m_nCarMission == MISSION_ATTACKPLAYER) &&
CTimer::GetTimeInMilliseconds() > m_nPoliceShoutTimer){
DMAudio.PlayOneShot(m_audioEntityId, SOUND_115, 0.0f);
DMAudio.PlayOneShot(m_audioEntityId, SOUND_PED_VCPA_PLAYER_FOUND, 0.0f);
m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds() + 4500 + (CGeneral::GetRandomNumber()&0xFFF);
}
}