Revert "Revert "update BASS libraries (#2377)""

This reverts commit 30639d6.

Author: patrikjuvonen

Client/loader/MainFunctions.cpp

@@ -832,14 +832,14 @@ void CheckDataFiles()
     {
         const char* szMd5;
         const char* szFilename;
-    } integrityCheckList[] = {{"7B9496FAB92A79476343DDEDD4C76BAD", "bass.dll"},
+    } integrityCheckList[] = {{"B5375C189939F366CC79ECA57A915615", "bass.dll"},
                               {"E48EA82D7A87853FA4F09F19C4E7A2C1", "bass_aac.dll"},
                               {"BD43C88917D6234FF962B6E88B648B8C", "bass_ac3.dll"},
                               {"03FB421991634C85D7AA7A914506381E", "bass_fx.dll"},
                               {"E2A26F0C195B75D520D39EAC4E4C804B", "bassflac.dll"},
                               {"2DF21511EB488D860BC43C904679D4AA", "bassmidi.dll"},
-                              {"01D4265D2E8F36677822833306F8D9F0", "bassmix.dll"},
-                              {"5E309F265D9A4769EB93D80B2A268A6B", "bassopus.dll"},
+                              {"7508CACD7EDC4749228BA0FB9A0BE296", "bassmix.dll"},
+                              {"26C74F5E9DF6C59DED3B09335E5D82AD", "bassopus.dll"},
                               {"476BDA1EE12C760A29E4EE43F593F878", "basswma.dll"},
                               {"6E2C5DCF4EE973E69ECA39288D20C436", "tags.dll"},
                               {"309D860FC8137E5FE9E7056C33B4B8BE", "vea.dll"},

Shared/data/MTA San Andreas/MTA/bass.dll

@@ -14,6 +14,11 @@
 #error conflicting BASS and BASSmix versions
 #endif
 
+#ifdef __OBJC__
+typedef int BOOL32;
+#define BOOL BOOL32 // override objc's BOOL
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -83,11 +88,14 @@ typedef struct {
 // Additional BASS_Mixer_ChannelSetPosition flag
 #define BASS_POS_MIXER_RESET	0x10000 // flag: clear mixer's playback buffer
 
+// Additional BASS_Mixer_ChannelGetPosition mode
+#define BASS_POS_MIXER_DELAY	5
+
 // BASS_CHANNELINFO types
 #define BASS_CTYPE_STREAM_MIXER	0x10800
 #define BASS_CTYPE_STREAM_SPLIT	0x10801
 
-DWORD BASSMIXDEF(BASS_Mixer_GetVersion)();
+DWORD BASSMIXDEF(BASS_Mixer_GetVersion)(void);
 
 HSTREAM BASSMIXDEF(BASS_Mixer_StreamCreate)(DWORD freq, DWORD chans, DWORD flags);
 BOOL BASSMIXDEF(BASS_Mixer_StreamAddChannel)(HSTREAM handle, DWORD channel, DWORD flags);
@@ -124,4 +132,8 @@ DWORD BASSMIXDEF(BASS_Split_StreamGetAvailable)(DWORD handle);
 }
 #endif
 
+#ifdef __OBJC__
+#undef BOOL
+#endif
+
 #endif