mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert some changes and little fix

This commit is contained in:
Roman Masanin 2020-10-02 20:35:16 +03:00
parent 6ff138ca76
commit 1991f9b362
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/audio/AudioManager.cpp
View File

@ -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;

2
src/audio/AudioManager.h
View File

@ -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)

2
src/audio/DMAudio.cpp
View File

@ -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