From 786e101acff29e07503a4d3c294b613d4a2714b3 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 22 May 2021 12:11:50 +0300
Subject: Use bool8 in audio code

---
 src/audio/MusicManager.h | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/audio/MusicManager.h')

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);
-- 
cgit v1.2.3