1 files changed, 22 insertions, 22 deletions

diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 5d7d39af..50d1b17f 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -135,9 +135,9 @@ class cSampleManager
 	uint8   m_nMP3BoostVolume;
 	uint8   m_nEffectsFadeVolume;
 	uint8   m_nMusicFadeVolume;
-	uint8   m_nMonoMode;
+	bool8   m_nMonoMode;
 	char    m_szCDRomRootPath[80];
-	bool    m_bInitialised;
+	bool8   m_bInitialised;
 	uint8   m_nNumberOfProviders;
 	char   *m_aAudioProviders[MAXPROVIDERS];
 	tSample m_aSamples[TOTAL_AUDIO_SAMPLES];
@@ -167,16 +167,16 @@ public:
 
 	int8 AutoDetect3DProviders();
 	
-	bool IsMP3RadioChannelAvailable(void);
+	bool8 IsMP3RadioChannelAvailable(void);
 	
 	void ReleaseDigitalHandle  (void);
 	void ReacquireDigitalHandle(void);
 	
-	bool Initialise(void);
-	void Terminate (void);
+	bool8 Initialise(void);
+	void  Terminate (void);
 		
-	bool CheckForAnAudioFileOnCD(void);
-	char GetCDAudioDriveLetter  (void);
+	bool8 CheckForAnAudioFileOnCD(void);
+	char  GetCDAudioDriveLetter  (void);
 	
 	void UpdateEffectsVolume(void);
 
@@ -185,14 +185,14 @@ public:
 	void SetMP3BoostVolume     (uint8 nVolume);
 	void SetEffectsFadeVolume  (uint8 nVolume);
 	void SetMusicFadeVolume    (uint8 nVolume);
-	void SetMonoMode           (uint8 nMode);
+	void SetMonoMode           (bool8 nMode);
 	
-	bool LoadSampleBank    (uint8 nBank);
-	void UnloadSampleBank  (uint8 nBank);
-	bool IsSampleBankLoaded(uint8 nBank);
+	bool8 LoadSampleBank    (uint8 nBank);
+	void  UnloadSampleBank  (uint8 nBank);
+	bool8 IsSampleBankLoaded(uint8 nBank);
 	
-	bool IsPedCommentLoaded(uint32 nComment);
-	bool LoadPedComment    (uint32 nComment);
+	bool8 IsPedCommentLoaded(uint32 nComment);
+	bool8 LoadPedComment    (uint32 nComment);
 	int32 GetBankContainingSound(uint32 offset);
 
 	int32 _GetPedCommentSlot(uint32 nComment);
@@ -202,10 +202,10 @@ public:
 	int32  GetSampleLoopEndOffset  (uint32 nSample);
 	uint32 GetSampleLength         (uint32 nSample);
 	
-	bool  UpdateReverb(void);
+	bool8  UpdateReverb(void);
 	
-	void  SetChannelReverbFlag    (uint32 nChannel, uint8 nReverbFlag);
-	bool  InitialiseChannel       (uint32 nChannel, uint32 nSfx, uint8 nBank);
+	void  SetChannelReverbFlag    (uint32 nChannel, bool8 nReverbFlag);
+	bool8 InitialiseChannel       (uint32 nChannel, uint32 nSfx, uint8 nBank);
 	void  SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume);
 	void  SetChannel3DPosition    (uint32 nChannel, float fX, float fY, float fZ);
 	void  SetChannel3DDistances   (uint32 nChannel, float fMax, float fMin);
@@ -214,23 +214,23 @@ public:
 	void  SetChannelFrequency     (uint32 nChannel, uint32 nFreq);
 	void  SetChannelLoopPoints    (uint32 nChannel, uint32 nLoopStart, int32 nLoopEnd);
 	void  SetChannelLoopCount     (uint32 nChannel, uint32 nLoopCount);
-	bool  GetChannelUsedFlag      (uint32 nChannel);
+	bool8 GetChannelUsedFlag      (uint32 nChannel);
 	void  StartChannel            (uint32 nChannel);
 	void  StopChannel             (uint32 nChannel);
 	
 	void  PreloadStreamedFile                                    (uint32 nFile, uint8 nStream);
-	void  PauseStream                                        (uint8 nPauseFlag, uint8 nStream);
+	void  PauseStream                                        (bool8 nPauseFlag, uint8 nStream);
 	void  StartPreloadedStreamedFile                                           (uint8 nStream);
-	bool  StartStreamedFile                         (uint32 nFile, uint32 nPos, uint8 nStream);
+	bool8 StartStreamedFile                         (uint32 nFile, uint32 nPos, uint8 nStream);
 	void  StopStreamedFile                                                     (uint8 nStream);
 	int32 GetStreamedFilePosition                                              (uint8 nStream);
-	void  SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, uint8 nEffectFlag, uint8 nStream);
+	void  SetStreamedVolumeAndPan(uint8 nVolume, uint8 nPan, bool8 nEffectFlag, uint8 nStream);
 	int32 GetStreamedFileLength                                                (uint8 nStream);
-	bool  IsStreamPlaying                                                      (uint8 nStream);
+	bool8 IsStreamPlaying                                                      (uint8 nStream);
 #ifdef AUDIO_OAL
 	void  Service(void);
 #endif
-	bool  InitialiseSampleBanks(void);
+	bool8 InitialiseSampleBanks(void);
 
 	uint8 GetMusicVolume() const { return m_nMusicVolume;  }
 	void SetStreamedFileLoopFlag(uint8 nLoopFlag, uint8 nStream);