summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorFilip Gawin <filip.gawin@zoho.com>2019-07-19 23:35:21 +0200
committerFilip Gawin <filip.gawin@zoho.com>2019-07-19 23:35:21 +0200
commite003f7ffba9983934203e2304118405c2e4f7333 (patch)
tree409428ab874deb58b600efc39a52e9c665cca0fc /src/audio
parentMore audio script (diff)
downloadre3-e003f7ffba9983934203e2304118405c2e4f7333.tar
re3-e003f7ffba9983934203e2304118405c2e4f7333.tar.gz
re3-e003f7ffba9983934203e2304118405c2e4f7333.tar.bz2
re3-e003f7ffba9983934203e2304118405c2e4f7333.tar.lz
re3-e003f7ffba9983934203e2304118405c2e4f7333.tar.xz
re3-e003f7ffba9983934203e2304118405c2e4f7333.tar.zst
re3-e003f7ffba9983934203e2304118405c2e4f7333.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/AudioManager.cpp4
-rw-r--r--src/audio/AudioManager.h2
-rw-r--r--src/audio/SampleManager.cpp2
-rw-r--r--src/audio/SampleManager.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 0fbc325a..07469b87 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -794,10 +794,10 @@ cAudioManager::MissionScriptAudioUsesPoliceChannel(int32 soundMission)
}
}
-uint8
+char *
cAudioManager::Get3DProviderName(uint8 id)
{
- if(m_bIsInitialised) return 0;
+ if(!m_bIsInitialised) return 0;
if(id >= num3DProvidersAvailable) return 0;
return asName3DProviders[id];
}
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 799526a3..8e8a1d1d 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -292,7 +292,7 @@ public:
bool MissionScriptAudioUsesPoliceChannel(int32 soundMission);
- uint8 Get3DProviderName(uint8 id);
+ char* Get3DProviderName(uint8 id);
bool SetupJumboFlySound(uint8 emittingVol); /// ok
bool SetupJumboRumbleSound(uint8 emittingVol); /// ok
diff --git a/src/audio/SampleManager.cpp b/src/audio/SampleManager.cpp
index f3e25f0f..b2f0cf35 100644
--- a/src/audio/SampleManager.cpp
+++ b/src/audio/SampleManager.cpp
@@ -6,7 +6,7 @@ CSampleManager &cSampleManager = *(CSampleManager *)0x7341E0;
uint32 &nNumOfMp3Files = *(uint32 *)0x95CC00;
uint8 &num3DProvidersAvailable = *(uint8 *)0x734237;
-uint32 *asName3DProviders = (uint32 *)0x734238;
+char **asName3DProviders = (char **)0x734238;
bool
CSampleManager::IsMP3RadioChannelAvailable()
diff --git a/src/audio/SampleManager.h b/src/audio/SampleManager.h
index e6c4e36f..dc46e7ec 100644
--- a/src/audio/SampleManager.h
+++ b/src/audio/SampleManager.h
@@ -63,6 +63,6 @@ public:
extern uint32 &nNumOfMp3Files;
extern uint8 &num3DProvidersAvailable;
-extern uint32 *asName3DProviders;
+extern char **asName3DProviders;
extern CSampleManager &cSampleManager; \ No newline at end of file