summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/audio/AudioManager.cpp19
-rw-r--r--src/audio/AudioManager.h2
-rw-r--r--src/audio/DMAudio.cpp2
3 files changed, 9 insertions, 14 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 638cafbf..93ac8857 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -411,19 +411,16 @@ cAudioManager::SetDynamicAcousticModelingStatus(uint8 status)
m_bDynamicAcousticModelingStatus = status!=0;
}
-//bool
-//cAudioManager::CheckForAnAudioFileOnCD() const
-//{
-// return SampleManager.CheckForAnAudioFileOnCD();
-//}
+bool
+cAudioManager::CheckForAnAudioFileOnCD() const
+{
+ return SampleManager.CheckForAnAudioFileOnCD();
+}
uint8
cAudioManager::GetCDAudioDriveLetter() const
{
- if (m_bIsInitialised)
- return SampleManager.GetCDAudioDriveLetter();
-
- return 0;
+ return SampleManager.GetCDAudioDriveLetter();
}
bool
@@ -945,8 +942,6 @@ void
cAudioManager::ClearRequestedQueue()
{
for (int32 i = 0; i < m_nActiveSamples; i++) {
- if (i >= m_nActiveSamples)
- break;
m_abSampleQueueIndexTable[m_nActiveSampleQueue][i] = m_nActiveSamples;
}
m_SampleRequestQueuesStatus[m_nActiveSampleQueue] = 0;
@@ -978,7 +973,7 @@ cAudioManager::ClearActiveSamples()
m_asActiveSamples[i].m_nCalculatedVolume = 0;
m_asActiveSamples[i].m_nReleasingVolumeDivider = 0;
m_asActiveSamples[i].m_nVolumeChange = -1;
- m_asActiveSamples[i].m_vecPos = {0.0f, 0.0f, 0.0f};
+ m_asActiveSamples[i].m_vecPos = CVector(0.0f, 0.0f, 0.0f);
m_asActiveSamples[i].m_bReverbFlag = false;
m_asActiveSamples[i].m_nLoopsRemaining = 0;
m_asActiveSamples[i].m_bRequireReflection = false;
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 8ac30ecb..267260c5 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -248,7 +248,7 @@ public:
void AgeCrimes(); // done (inlined in vc)
void CalculateDistance(bool &condition, float dist); // done
- //bool CheckForAnAudioFileOnCD() const; // not exists in v1.0 and android
+ bool CheckForAnAudioFileOnCD() const; // done
void ClearActiveSamples(); // done
void ClearMissionAudio(uint8 slot); // done
void ClearRequestedQueue(); // done (inlined in vc)
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index f09f4256..486daebf 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -171,7 +171,7 @@ cDMAudio::SetDynamicAcousticModelingStatus(uint8 status)
bool
cDMAudio::CheckForAnAudioFileOnCD(void)
{
- return 0; //exists only in android version, and used only in symbols
+ return AudioManager.CheckForAnAudioFileOnCD();
}
char