mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-29 12:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse source 
# Conflicts:
#	src/audio/AudioLogic.cpp
This commit is contained in:
Sergeanur 2021-07-28 00:42:18 +03:00
commit 029e315f0a
2 changed files with 511 additions and 512 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

983
src/audio/AudioLogic.cpp
View file

File diff suppressed because it is too large Load diff

22
src/audio/AudioManager.h
View file

@ -260,7 +260,7 @@ public:
// "Should" be in alphabetic order, except "getXTalkSfx" // "Should" be in alphabetic order, except "getXTalkSfx"
void AddDetailsToRequestedOrderList(uint8 sample); // inlined in vc void AddDetailsToRequestedOrderList(uint8 sample); // inlined in vc
void AddPlayerCarSample(uint8 emittingVolume, int32 freq, uint32 sample, uint8 bank, uint8 counter, bool8 notLooping); void AddPlayerCarSample(uint8 emittingVolume, uint32 freq, uint32 sample, uint8 bank, uint8 counter, bool8 notLooping);
void AddReflectionsToRequestedQueue(); void AddReflectionsToRequestedQueue();
void AddReleasingSounds(); void AddReleasingSounds();
void AddSampleToRequestedQueue(); void AddSampleToRequestedQueue();
@ -390,8 +390,8 @@ public:
float GetCollisionLoopingRatio(uint32 a, uint32 b, float c); // not used float GetCollisionLoopingRatio(uint32 a, uint32 b, float c); // not used
float GetCollisionOneShotRatio(int32 a, float b); float GetCollisionOneShotRatio(int32 a, float b);
float GetCollisionRatio(float a, float b, float c, float d); // inlined in vc float GetCollisionRatio(float a, float b, float c, float d); // inlined in vc
float GetDistanceSquared(const CVector &v) const; // inlined in vc float GetDistanceSquared(const CVector &v); // inlined in vc
int32 GetJumboTaxiFreq() const; // inlined in vc int32 GetJumboTaxiFreq(); // inlined in vc
uint8 GetMissionAudioLoadingStatus(uint8 slot) const; uint8 GetMissionAudioLoadingStatus(uint8 slot) const;
int8 GetMissionScriptPoliceAudioPlayingStatus(); int8 GetMissionScriptPoliceAudioPlayingStatus();
uint8 GetNum3DProvidersAvailable(); uint8 GetNum3DProvidersAvailable();
@ -401,7 +401,7 @@ public:
float velocityChange); float velocityChange);
float GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange); float GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange);
bool8 HasAirBrakes(int32 model) const; bool8 HasAirBrakes(uint32 model);
void Initialise(); void Initialise();
void InitialisePoliceRadio(); void InitialisePoliceRadio();
@ -418,11 +418,11 @@ public:
void PlayLoadedMissionAudio(uint8 slot); void PlayLoadedMissionAudio(uint8 slot);
void PlayOneShot(int32 index, uint16 sound, float vol); void PlayOneShot(int32 index, uint16 sound, float vol);
void PlaySuspectLastSeen(float x, float y, float z); void PlaySuspectLastSeen(float x, float y, float z);
void PlayerJustGotInCar() const; void PlayerJustGotInCar();
void PlayerJustLeftCar() const; void PlayerJustLeftCar();
void PostInitialiseGameSpecificSetup(); void PostInitialiseGameSpecificSetup();
void PostTerminateGameSpecificShutdown(); void PostTerminateGameSpecificShutdown();
void PreInitialiseGameSpecificSetup() const; void PreInitialiseGameSpecificSetup();
void PreloadMissionAudio(uint8 slot, Const char *name); void PreloadMissionAudio(uint8 slot, Const char *name);
void PreTerminateGameSpecificShutdown(); void PreTerminateGameSpecificShutdown();
/// processX - main logic of adding new sounds /// processX - main logic of adding new sounds
@ -468,7 +468,7 @@ public:
void ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh); void ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh);
void ProcessProjectiles(); void ProcessProjectiles();
void ProcessRainOnVehicle(cVehicleParams& params); void ProcessRainOnVehicle(cVehicleParams& params);
void ProcessReverb() const; void ProcessReverb();
bool8 ProcessReverseGear(cVehicleParams& params); bool8 ProcessReverseGear(cVehicleParams& params);
void ProcessScriptObject(int32 id); void ProcessScriptObject(int32 id);
void ProcessSpecial(); void ProcessSpecial();
@ -534,9 +534,9 @@ public:
void UpdateGasPedalAudio(CVehicle *veh, int vehType); void UpdateGasPedalAudio(CVehicle *veh, int vehType);
void UpdateReflections(); void UpdateReflections();
bool8 UsesReverseWarning(int32 model) const; bool8 UsesReverseWarning(uint32 model);
bool8 UsesSiren(cVehicleParams &params) const; bool8 UsesSiren(cVehicleParams &params);
bool8 UsesSirenSwitching(cVehicleParams &params) const; bool8 UsesSirenSwitching(cVehicleParams &params);
CVehicle *FindVehicleOfPlayer(); CVehicle *FindVehicleOfPlayer();
void SetPedTalkingStatus(CPed *ped, bool8 status); void SetPedTalkingStatus(CPed *ped, bool8 status);