a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-06-29 11:57:05 +00:00
Code Issues Projects Releases Wiki Activity

DMAudio fixes

Browse source
This commit is contained in:
Sergeanur 2020-10-25 09:42:24 +02:00
parent de09a80a35
commit 93b318cfdf
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/audio/AudioLogic.cpp
View file

@ -4554,7 +4554,7 @@ cAudioManager::SetPedTalkingStatus(CPed *ped, uint8 status)
} }
void void
cAudioManager::SetPlayersMood(uint8 mood, int32 time) cAudioManager::SetPlayersMood(uint8 mood, uint32 time)
{ {
if (!m_bIsInitialised) return; if (!m_bIsInitialised) return;

2
src/audio/AudioManager.h
View file

@ -415,7 +415,7 @@ public:
CVehicle *FindVehicleOfPlayer(); //done CVehicle *FindVehicleOfPlayer(); //done
void SetPedTalkingStatus(CPed *ped, uint8 status); void SetPedTalkingStatus(CPed *ped, uint8 status);
void SetPlayersMood(uint8 mood, int32 time); void SetPlayersMood(uint8 mood, uint32 time);
#ifdef GTA_PC #ifdef GTA_PC
// only used in pc // only used in pc

10
src/audio/DMAudio.cpp
View file

@ -241,13 +241,13 @@ cDMAudio::PlayFrontEndSound(uint16 frontend, uint32 volume)
} }
void void
cDMAudio::PlayRadioAnnouncement(uint8 announcement) cDMAudio::PlayRadioAnnouncement(uint32 announcement)
{ {
MusicManager.PlayAnnouncement(announcement); MusicManager.PlayAnnouncement(announcement);
} }
void void
cDMAudio::PlayFrontEndTrack(uint8 track, uint8 frontendFlag) cDMAudio::PlayFrontEndTrack(uint32 track, uint8 frontendFlag)
{ {
MusicManager.PlayFrontEndTrack(track, frontendFlag); MusicManager.PlayFrontEndTrack(track, frontendFlag);
} }
@ -271,7 +271,7 @@ cDMAudio::ChangeMusicMode(uint8 mode)
} }
void void
cDMAudio::PreloadCutSceneMusic(uint8 track) cDMAudio::PreloadCutSceneMusic(uint32 track)
{ {
MusicManager.PreloadCutSceneMusic(track); MusicManager.PreloadCutSceneMusic(track);
} }
@ -337,7 +337,7 @@ cDMAudio::SetRadioInCar(uint32 radio)
} }
void void
cDMAudio::SetRadioChannel(int8 radio, int32 pos) cDMAudio::SetRadioChannel(uint32 radio, int32 pos)
{ {
MusicManager.SetRadioChannelByScript(radio, pos); MusicManager.SetRadioChannelByScript(radio, pos);
} }
@ -373,7 +373,7 @@ cDMAudio::SetPedTalkingStatus(CPed *ped, uint8 status)
} }
void void
cDMAudio::SetPlayersMood(uint8 mood, int32 time) cDMAudio::SetPlayersMood(uint8 mood, uint32 time)
{ {
return AudioManager.SetPlayersMood(mood, time); return AudioManager.SetPlayersMood(mood, time);
} }

10
src/audio/DMAudio.h
View file

@ -69,15 +69,15 @@ public:
void ReportCollision(CEntity *entityA, CEntity *entityB, uint8 surfaceTypeA, uint8 surfaceTypeB, float collisionPower, float velocity); void ReportCollision(CEntity *entityA, CEntity *entityB, uint8 surfaceTypeA, uint8 surfaceTypeB, float collisionPower, float velocity);
void PlayFrontEndSound(uint16 frontend, uint32 volume); void PlayFrontEndSound(uint16 frontend, uint32 volume);
void PlayRadioAnnouncement(uint8 announcement); void PlayRadioAnnouncement(uint32 announcement);
void PlayFrontEndTrack(uint8 track, uint8 frontendFlag); void PlayFrontEndTrack(uint32 track, uint8 frontendFlag);
void StopFrontEndTrack(void); void StopFrontEndTrack(void);
void ResetTimers(uint32 time); void ResetTimers(uint32 time);
void ChangeMusicMode(uint8 mode); void ChangeMusicMode(uint8 mode);
void PreloadCutSceneMusic(uint8 track); void PreloadCutSceneMusic(uint32 track);
void PlayPreloadedCutSceneMusic(void); void PlayPreloadedCutSceneMusic(void);
void StopCutSceneMusic(void); void StopCutSceneMusic(void);
@ -90,14 +90,14 @@ public:
uint8 GetRadioInCar(void); uint8 GetRadioInCar(void);
void SetRadioInCar(uint32 radio); void SetRadioInCar(uint32 radio);
void SetRadioChannel(int8 radio, int32 pos); void SetRadioChannel(uint32 radio, int32 pos);
void SetStartingTrackPositions(uint8 isStartGame); void SetStartingTrackPositions(uint8 isStartGame);
float *GetListenTimeArray(); float *GetListenTimeArray();
uint32 GetFavouriteRadioStation(); uint32 GetFavouriteRadioStation();
int32 GetRadioPosition(uint32 station); int32 GetRadioPosition(uint32 station);
void SetPedTalkingStatus(class CPed *ped, uint8 status); void SetPedTalkingStatus(class CPed *ped, uint8 status);
void SetPlayersMood(uint8 mood, int32 time); void SetPlayersMood(uint8 mood, uint32 time);
void ShutUpPlayerTalking(uint8 state); void ShutUpPlayerTalking(uint8 state);
}; };
extern cDMAudio DMAudio; extern cDMAudio DMAudio;