5 files changed, 20 insertions, 20 deletions

diff --git a/src/audio/AudioScriptObject.cpp b/src/audio/AudioScriptObject.cpp
index 7cb81f7a..a8c645d4 100644
--- a/src/audio/AudioScriptObject.cpp
+++ b/src/audio/AudioScriptObject.cpp
@@ -1,7 +1,7 @@
 #include "common.h"
 #include "AudioScriptObject.h"
 
-void PlayOneShotScriptObject(UInt8 id, CVector const &pos)
+void PlayOneShotScriptObject(uint8 id, CVector const &pos)
 {
-	((void (__cdecl *)(UInt8, CVector const &))0x57C5F0)(id, pos);
+	((void (__cdecl *)(uint8, CVector const &))0x57C5F0)(id, pos);
 }
\ No newline at end of file
diff --git a/src/audio/AudioScriptObject.h b/src/audio/AudioScriptObject.h
index a30af679..c325ce27 100644
--- a/src/audio/AudioScriptObject.h
+++ b/src/audio/AudioScriptObject.h
@@ -128,4 +128,4 @@ enum /*eSounds*/
 	_SOUND_BULLET_SHELL_HIT_GROUND_2  = 123,
 };
 
-extern void PlayOneShotScriptObject(UInt8 id, CVector const &pos);
\ No newline at end of file
+extern void PlayOneShotScriptObject(uint8 id, CVector const &pos);
\ No newline at end of file
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index dcfdc81b..7f74fd8a 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -10,10 +10,10 @@ WRAPPER void cDMAudio::ReacquireDigitalHandle(void) { EAXJMP(0x57CA30); }
 
 WRAPPER void cDMAudio::Service(void) { EAXJMP(0x57C7A0); }
 WRAPPER void cDMAudio::ReportCollision(CEntity *A, CEntity *B, uint8 surfA, uint8 surfB, float impulse, float speed) { EAXJMP(0x57CBE0); }
-WRAPPER void cDMAudio::ResetTimers(UInt32 timerval) { EAXJMP(0x57CCD0); }
-WRAPPER Bool cDMAudio::IsAudioInitialised() { EAXJMP(0x57CAB0); }
-WRAPPER Char cDMAudio::GetCDAudioDriveLetter() { EAXJMP(0x57CA90); }
-WRAPPER Bool cDMAudio::CheckForAnAudioFileOnCD() { EAXJMP(0x57CA70); }
-WRAPPER void cDMAudio::ChangeMusicMode(UInt8 mode) { EAXJMP(0x57CCF0); }
+WRAPPER void cDMAudio::ResetTimers(uint32 timerval) { EAXJMP(0x57CCD0); }
+WRAPPER bool cDMAudio::IsAudioInitialised() { EAXJMP(0x57CAB0); }
+WRAPPER char cDMAudio::GetCDAudioDriveLetter() { EAXJMP(0x57CA90); }
+WRAPPER bool cDMAudio::CheckForAnAudioFileOnCD() { EAXJMP(0x57CA70); }
+WRAPPER void cDMAudio::ChangeMusicMode(uint8 mode) { EAXJMP(0x57CCF0); }
 
 WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); }
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index b9e60b60..9006d248 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -182,11 +182,11 @@ public:
 	void ReacquireDigitalHandle(void);
 	void Service(void);
 	void ReportCollision(CEntity* A, CEntity* B, uint8 surfA, uint8 surfB, float impulse, float speed);
-	void ResetTimers(UInt32 timerval);
-	Bool IsAudioInitialised(void);
-	Char GetCDAudioDriveLetter(void);
-	Bool CheckForAnAudioFileOnCD(void);
-	void ChangeMusicMode(UInt8 mode);
+	void ResetTimers(uint32 timerval);
+	bool IsAudioInitialised(void);
+	char GetCDAudioDriveLetter(void);
+	bool CheckForAnAudioFileOnCD(void);
+	void ChangeMusicMode(uint8 mode);
 	void PlayFrontEndSound(uint32, uint32);
 };
 extern cDMAudio &DMAudio;
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 7932ca31..48df60ba 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -226,7 +226,7 @@ public:
 class cMusicManager
 {
 public:
-	Bool m_bIsInitialised;
+	bool m_bIsInitialised;
 	uint8 field_1;
 	uint8 m_nMusicMode;
 	uint8 m_nCurrentStreamedSound;
@@ -234,10 +234,10 @@ public:
 	uint8 field_5;
 	uint8 field_6;
 	uint8 field_7;
-	Bool m_bAnnouncement;
-	Bool m_bPreviousPlayerInCar;
-	Bool m_bPlayerInCar;
-	Bool m_bAnnouncementInProgress;
+	bool m_bAnnouncement;
+	bool m_bPreviousPlayerInCar;
+	bool m_bPlayerInCar;
+	bool m_bAnnouncementInProgress;
 	tMP3Sample m_asMP3Samples[196];
 	uint8 field_2364;
 	uint8 field_2365;
@@ -249,13 +249,13 @@ public:
 	uint8 field_2380;
 	uint8 field_2381;
 	uint8 field_2382;
-	Bool m_bRadioSetByScript;
+	bool m_bRadioSetByScript;
 	uint8 m_nRadioStation;
 	uint8 field_2385;
 	uint8 field_2386;
 	uint8 field_2387;
 	uint32 m_nRadioPosition;
-	Bool m_bRadioInCar;
+	bool m_bRadioInCar;
 	uint8 field_2393;
 	uint8 field_2394;
 	uint8 field_2395;