summaryrefslogtreecommitdiffstats
path: root/src/audio/MusicManager.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-05-22 11:11:50 +0200
committerSergeanur <s.anureev@yandex.ua>2021-06-24 20:32:43 +0200
commit786e101acff29e07503a4d3c294b613d4a2714b3 (patch)
treea5cf2a6b05190591891cb4cbf913d1fd667c58c1 /src/audio/MusicManager.h
parentFix C3dMarkers::PlaceMarker calls in Radar (diff)
downloadre3-786e101acff29e07503a4d3c294b613d4a2714b3.tar
re3-786e101acff29e07503a4d3c294b613d4a2714b3.tar.gz
re3-786e101acff29e07503a4d3c294b613d4a2714b3.tar.bz2
re3-786e101acff29e07503a4d3c294b613d4a2714b3.tar.lz
re3-786e101acff29e07503a4d3c294b613d4a2714b3.tar.xz
re3-786e101acff29e07503a4d3c294b613d4a2714b3.tar.zst
re3-786e101acff29e07503a4d3c294b613d4a2714b3.zip
Diffstat (limited to '')
-rw-r--r--src/audio/MusicManager.h42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 5d277f0e..4c4447fe 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -15,48 +15,48 @@ class CVehicle;
class cMusicManager
{
public:
- bool m_bIsInitialised;
- bool m_bDisabled;
+ bool8 m_bIsInitialised;
+ bool8 m_bDisabled;
uint8 m_nMusicMode;
uint8 m_nNextTrack;
uint8 m_nPlayingTrack;
- bool m_bFrontendTrackFinished;
- bool m_bPlayInFrontend;
- bool m_bSetNextStation;
+ bool8 m_bFrontendTrackFinished;
+ bool8 m_bPlayInFrontend;
+ bool8 m_bSetNextStation;
uint8 m_nAnnouncement;
- bool m_bPreviousPlayerInCar;
- bool m_bPlayerInCar;
- bool m_bAnnouncementInProgress;
+ bool8 m_bPreviousPlayerInCar;
+ bool8 m_bPlayerInCar;
+ bool8 m_bAnnouncementInProgress;
tStreamedSample m_aTracks[TOTAL_STREAMED_SOUNDS];
- bool m_bResetTimers;
+ bool8 m_bResetTimers;
uint32 m_nResetTime;
uint32 m_nLastTrackServiceTime;
uint32 m_nTimer;
- bool m_bDoTrackService;
- bool m_bIgnoreTimeDelay;
- bool m_bVerifyAmbienceTrackStartedToPlay;
- bool m_bRadioSetByScript;
+ bool8 m_bDoTrackService;
+ bool8 m_bIgnoreTimeDelay;
+ bool8 m_bVerifyAmbienceTrackStartedToPlay;
+ bool8 m_bRadioSetByScript;
uint8 m_nRadioStationScript;
int32 m_nRadioPosition;
uint8 m_nRadioInCar;
public:
cMusicManager();
- bool IsInitialised() { return m_bIsInitialised; }
+ bool8 IsInitialised() { return m_bIsInitialised; }
uint32 GetMusicMode() { return m_nMusicMode; }
uint8 GetNextTrack() { return m_nNextTrack; }
- bool Initialise();
+ bool8 Initialise();
void Terminate();
void ChangeMusicMode(uint8 mode);
void StopFrontEndTrack();
- bool PlayerInCar();
+ bool8 PlayerInCar();
void DisplayRadioStationName();
void PlayAnnouncement(uint8);
- void PlayFrontEndTrack(uint8, uint8);
+ void PlayFrontEndTrack(uint8, bool8);
void PreloadCutSceneMusic(uint8);
void PlayPreloadedCutSceneMusic(void);
void StopCutSceneMusic(void);
@@ -73,15 +73,15 @@ public:
void ServiceAmbience();
void ServiceTrack();
- bool UsesPoliceRadio(CVehicle *veh);
+ bool8 UsesPoliceRadio(CVehicle *veh);
uint32 GetTrackStartPos(uint8);
- void ComputeAmbienceVol(uint8 reset, uint8& outVolume);
- bool ServiceAnnouncement();
+ void ComputeAmbienceVol(bool8 reset, uint8& outVolume);
+ bool8 ServiceAnnouncement();
uint8 GetCarTuning();
uint8 GetNextCarTuning();
- bool ChangeRadioChannel();
+ bool8 ChangeRadioChannel();
};
VALIDATE_SIZE(cMusicManager, 0x95C);