diff options
| author | aap <aap@papnet.eu> | 2020-05-27 07:10:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 07:10:36 +0200 |
| commit | 4868bf13a8cab8fd62567c9544ff06197d6991a5 (patch) | |
| tree | 917402726d9ec883378751256c1232ab7cc0b734 /src/audio/MusicManager.h | |
| parent | MT function for fakerw (diff) | |
| parent | OpenAL support (diff) | |
| download | re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.gz re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.bz2 re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.lz re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.xz re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.tar.zst re3-4868bf13a8cab8fd62567c9544ff06197d6991a5.zip | |
Diffstat (limited to 'src/audio/MusicManager.h')
| -rw-r--r-- | src/audio/MusicManager.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h index e8b94da6..217b037b 100644 --- a/src/audio/MusicManager.h +++ b/src/audio/MusicManager.h @@ -18,12 +18,12 @@ public: bool m_bIsInitialised; bool m_bDisabled; uint8 m_nMusicMode; - uint8 m_nCurrentStreamedSound; - uint8 m_nPreviousStreamedSound; + uint32 m_nCurrentStreamedSound; + uint32 m_nPreviousStreamedSound; bool m_bFrontendTrackFinished; bool m_bPlayInFrontend; bool m_bSetNextStation; - uint8 m_nAnnouncement; + uint32 m_nAnnouncement; bool m_bPreviousPlayerInCar; bool m_bPlayerInCar; bool m_bAnnouncementInProgress; @@ -36,9 +36,9 @@ public: bool m_bIgnoreTimeDelay; bool m_bDontServiceAmbienceTrack; bool m_bRadioSetByScript; - uint8 m_nRadioStation; + uint32 m_nRadioStation; int32 m_nRadioPosition; - uint8 m_nRadioInCar; + uint32 m_nRadioInCar; public: cMusicManager(); @@ -55,9 +55,9 @@ public: bool PlayerInCar(); void DisplayRadioStationName(); - void PlayAnnouncement(uint8); - void PlayFrontEndTrack(uint8, uint8); - void PreloadCutSceneMusic(uint8); + void PlayAnnouncement(uint32); + void PlayFrontEndTrack(uint32, uint8); + void PreloadCutSceneMusic(uint32); void PlayPreloadedCutSceneMusic(void); void StopCutSceneMusic(void); uint8 GetRadioInCar(void); @@ -79,8 +79,8 @@ public: void ComputeAmbienceVol(uint8 reset, uint8& outVolume); bool ServiceAnnouncement(); - uint8 GetCarTuning(); - uint8 GetNextCarTuning(); + uint32 GetCarTuning(); + uint32 GetNextCarTuning(); bool ChangeRadioChannel(); }; |