diff options
author | Sergeanur <s.anureev@yandex.ua> | 2020-10-25 08:42:24 +0100 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2020-10-25 08:42:24 +0100 |
commit | 93b318cfdf75b8ca33ee70cbe1afeee851fce27e (patch) | |
tree | 08bb69cfaeaa18d94cc5e1a046947375b632911f /src/audio | |
parent | Messages fix and update librw (diff) | |
download | re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.tar re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.tar.gz re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.tar.bz2 re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.tar.lz re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.tar.xz re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.tar.zst re3-93b318cfdf75b8ca33ee70cbe1afeee851fce27e.zip |
Diffstat (limited to 'src/audio')
-rw-r--r-- | src/audio/AudioLogic.cpp | 2 | ||||
-rw-r--r-- | src/audio/AudioManager.h | 2 | ||||
-rw-r--r-- | src/audio/DMAudio.cpp | 10 | ||||
-rw-r--r-- | src/audio/DMAudio.h | 10 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index d4ddbda8..c3f969a7 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -4554,7 +4554,7 @@ cAudioManager::SetPedTalkingStatus(CPed *ped, uint8 status) } void -cAudioManager::SetPlayersMood(uint8 mood, int32 time) +cAudioManager::SetPlayersMood(uint8 mood, uint32 time) { if (!m_bIsInitialised) return; diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index d7a744cd..d1a3b3b7 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -415,7 +415,7 @@ public: CVehicle *FindVehicleOfPlayer(); //done void SetPedTalkingStatus(CPed *ped, uint8 status); - void SetPlayersMood(uint8 mood, int32 time); + void SetPlayersMood(uint8 mood, uint32 time); #ifdef GTA_PC // only used in pc diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index ade53d9b..5fb1b81c 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -241,13 +241,13 @@ cDMAudio::PlayFrontEndSound(uint16 frontend, uint32 volume) } void -cDMAudio::PlayRadioAnnouncement(uint8 announcement) +cDMAudio::PlayRadioAnnouncement(uint32 announcement) { MusicManager.PlayAnnouncement(announcement); } void -cDMAudio::PlayFrontEndTrack(uint8 track, uint8 frontendFlag) +cDMAudio::PlayFrontEndTrack(uint32 track, uint8 frontendFlag) { MusicManager.PlayFrontEndTrack(track, frontendFlag); } @@ -271,7 +271,7 @@ cDMAudio::ChangeMusicMode(uint8 mode) } void -cDMAudio::PreloadCutSceneMusic(uint8 track) +cDMAudio::PreloadCutSceneMusic(uint32 track) { MusicManager.PreloadCutSceneMusic(track); } @@ -337,7 +337,7 @@ cDMAudio::SetRadioInCar(uint32 radio) } void -cDMAudio::SetRadioChannel(int8 radio, int32 pos) +cDMAudio::SetRadioChannel(uint32 radio, int32 pos) { MusicManager.SetRadioChannelByScript(radio, pos); } @@ -373,7 +373,7 @@ cDMAudio::SetPedTalkingStatus(CPed *ped, uint8 status) } void -cDMAudio::SetPlayersMood(uint8 mood, int32 time) +cDMAudio::SetPlayersMood(uint8 mood, uint32 time) { return AudioManager.SetPlayersMood(mood, time); } diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h index ef62294e..2c10043f 100644 --- a/src/audio/DMAudio.h +++ b/src/audio/DMAudio.h @@ -69,15 +69,15 @@ public: void ReportCollision(CEntity *entityA, CEntity *entityB, uint8 surfaceTypeA, uint8 surfaceTypeB, float collisionPower, float velocity); void PlayFrontEndSound(uint16 frontend, uint32 volume); - void PlayRadioAnnouncement(uint8 announcement); - void PlayFrontEndTrack(uint8 track, uint8 frontendFlag); + void PlayRadioAnnouncement(uint32 announcement); + void PlayFrontEndTrack(uint32 track, uint8 frontendFlag); void StopFrontEndTrack(void); void ResetTimers(uint32 time); void ChangeMusicMode(uint8 mode); - void PreloadCutSceneMusic(uint8 track); + void PreloadCutSceneMusic(uint32 track); void PlayPreloadedCutSceneMusic(void); void StopCutSceneMusic(void); @@ -90,14 +90,14 @@ public: uint8 GetRadioInCar(void); void SetRadioInCar(uint32 radio); - void SetRadioChannel(int8 radio, int32 pos); + void SetRadioChannel(uint32 radio, int32 pos); void SetStartingTrackPositions(uint8 isStartGame); float *GetListenTimeArray(); uint32 GetFavouriteRadioStation(); int32 GetRadioPosition(uint32 station); void SetPedTalkingStatus(class CPed *ped, uint8 status); - void SetPlayersMood(uint8 mood, int32 time); + void SetPlayersMood(uint8 mood, uint32 time); void ShutUpPlayerTalking(uint8 state); }; extern cDMAudio DMAudio; |