From f85b5e99edfb2e1b9a4563cacc96892195eee379 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sat, 16 Jan 2021 16:44:59 +0300
Subject: Includes overhaul, fix some compiler warnings

---
 src/audio/AudioLogic.cpp    |  2 +-
 src/audio/PoliceRadio.cpp   |  1 +
 src/audio/PoliceRadio.h     |  2 +-
 src/audio/sampman.h         |  1 -
 src/audio/sampman_miles.cpp |  6 ++----
 src/audio/sampman_oal.cpp   | 35 ++++++++++++++++-------------------
 6 files changed, 21 insertions(+), 26 deletions(-)

(limited to 'src/audio')

diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 7d759279..c58daaaf 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -41,7 +41,7 @@
 #include "WindModifiers.h"
 #include "Fluff.h"
 #include "Script.h"
-
+#include "Wanted.h"
 
 const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
 const int policeChannel = channels + 1;
diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PoliceRadio.cpp
index cf6f5bee..e174e587 100644
--- a/src/audio/PoliceRadio.cpp
+++ b/src/audio/PoliceRadio.cpp
@@ -13,6 +13,7 @@
 #include "World.h"
 #include "Zones.h"
 #include "sampman.h"
+#include "Wanted.h"
 
 const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
 const int policeChannel = channels + 1;
diff --git a/src/audio/PoliceRadio.h b/src/audio/PoliceRadio.h
index e9a0fde0..d7c928e2 100644
--- a/src/audio/PoliceRadio.h
+++ b/src/audio/PoliceRadio.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Wanted.h"
+#include "Crime.h"
 
 struct cAMCrime {
 	int32 type;
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index 2db29244..5d7d39af 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "common.h"
 #include "AudioSamples.h"
 
 #define MAX_VOLUME 127
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index c360d64f..2d6a655e 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -1,8 +1,5 @@
-#include "common.h"
-
 #ifdef AUDIO_MSS
-#include <windows.h>
-#include <shobjidl.h>
+#include <shlobj.h>
 #include <shlguid.h>
 
 #include <time.h>
@@ -11,6 +8,7 @@
 #include "eax-util.h"
 #include "mss.h"
 
+#include "common.h"
 #include "sampman.h"
 #include "AudioManager.h"
 #include "MusicManager.h"
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 5fe05d54..0d06098d 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -1,17 +1,11 @@
 //#define JUICY_OAL
 
 #ifdef AUDIO_OAL
-#include "sampman.h"
-
 #include <time.h>
 
 #include "eax.h"
 #include "eax-util.h"
 
-#define WITHWINDOWS
-#include "common.h"
-#include "crossplatform.h"
-
 #ifdef _WIN32
 #include <io.h>
 #include <AL/al.h>
@@ -19,8 +13,24 @@
 #include <AL/alext.h>
 #include <AL/efx.h>
 #include <AL/efx-presets.h>
+
+// for user MP3s
+#include <direct.h>
+#include <shlobj.h>
+#include <shlguid.h>
+#else
+#define _getcwd getcwd
+#endif
+
+#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
+#pragma comment( lib, "OpenAL32.lib" )
 #endif
 
+#include "common.h"
+#include "crossplatform.h"
+
+#include "sampman.h"
+
 #include "oal/oal_utils.h"
 #include "oal/aldlist.h"
 #include "oal/channel.h"
@@ -38,19 +48,6 @@
 //TODO: max channels
 //TODO: loop count
 
-#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
-#pragma comment( lib, "OpenAL32.lib" )
-#endif
-
-// for user MP3s
-#ifdef _WIN32
-#include <direct.h>
-#include <shobjidl.h>
-#include <shlguid.h>
-#else
-#define _getcwd getcwd
-#endif
-
 cSampleManager SampleManager;
 bool _bSampmanInitialised = false;
 
-- 
cgit v1.2.3


From b35b0c598d183e2ba73c73ad82a03f833556dc27 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 23 Jan 2021 03:09:15 +0200
Subject: Enable GTA_BRIDGE

---
 src/audio/AudioLogic.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/audio')

diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index c2050f59..a06df0d0 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -9311,7 +9311,8 @@ cAudioManager::ProcessBridge()
 void
 cAudioManager::ProcessBridgeWarning()
 {
-	if (CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) {
+	// TODO: LCS
+/*	if (CStats::CommercialPassed && m_sQueueSample.m_fDistance < 450.f) {
 		m_sQueueSample.m_nVolume = ComputeVolume(100, 450.f, m_sQueueSample.m_fDistance);
 		if (m_sQueueSample.m_nVolume != 0) {
 			m_sQueueSample.m_nCounter = 0;
@@ -9332,7 +9333,7 @@ cAudioManager::ProcessBridgeWarning()
 			m_sQueueSample.m_bRequireReflection = false;
 			AddSampleToRequestedQueue();
 		}
-	}
+	}*/
 }
 
 void
-- 
cgit v1.2.3


From 0aad73f4a1fdc4e900eeafb6bd89f462f1f121af Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 23 Jan 2021 03:39:24 +0200
Subject: Remove size assert

---
 src/audio/AudioManager.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/audio')

diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index b5e9b499..f715fb45 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -544,8 +544,8 @@ public:
 #endif
 };
 
-#ifdef AUDIO_MSS
-static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error");
-#endif
+//#ifdef AUDIO_MSS
+//static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error");
+//#endif
 
 extern cAudioManager AudioManager;
-- 
cgit v1.2.3