Merge branch 'master' into opus

# Conflicts:
#	eax/eax.h
#	premake5.lua
#	src/audio/oal/stream.cpp

src/audio/AudioManager.cpp

@@ -39,8 +39,8 @@ cAudioManager::cAudioManager()
 	}
 	m_nAudioEntitiesTotal = 0;
 	m_FrameCounter = 0;
-	m_bFifthFrameFlag = 0;
-	m_bTimerJustReset = 0;
+	m_bFifthFrameFlag = false;
+	m_bTimerJustReset = false;
 	m_nTimer = 0;
 }
 

src/audio/AudioManager.h

@@ -328,7 +328,7 @@ public:
 	float GetCollisionRatio(float a, float b, float c, float d) const;
 	float GetDistanceSquared(const CVector &v) const;
 	int32 GetJumboTaxiFreq() const;
-	bool GetMissionAudioLoadingStatus() const;
+	uint8 GetMissionAudioLoadingStatus() const;
 	int8 GetMissionScriptPoliceAudioPlayingStatus() const;
 	uint8 GetNum3DProvidersAvailable() const;
 	int32 GetPedCommentSfx(CPed *ped, int32 sound);

src/audio/oal/channel.cpp

@@ -1,7 +1,7 @@
-#include "channel.h"
+#include "common.h"
 
 #ifdef AUDIO_OAL
-#include "common.h"
+#include "channel.h"
 #include "sampman.h"
 
 #ifndef _WIN32

src/audio/oal/channel.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #ifdef AUDIO_OAL
 #include "oal/oal_utils.h"

src/audio/oal/oal_utils.cpp

@@ -1,3 +1,4 @@
+#include "common.h"
 #include "oal_utils.h"
 
 #ifdef AUDIO_OAL

src/audio/oal/oal_utils.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #ifdef AUDIO_OAL
 #include "eax.h"

src/audio/oal/stream.cpp

@@ -1,7 +1,7 @@
-#include "stream.h"
+#include "common.h"
 
 #ifdef AUDIO_OAL
-#include "common.h"
+#include "stream.h"
 #include "sampman.h"
 
 #ifdef AUDIO_OPUS

src/audio/oal/stream.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 
 #ifdef AUDIO_OAL
 #include <AL/al.h>