Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Two audio structs renamed to their original names

Browse Source
This commit is contained in:
Sergeanur 2020-01-13 19:36:30 +02:00
parent d482f097fe
commit 045c638067
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AudioManager.cpp
View File

@ -427,7 +427,7 @@ cAudioManager::AddReleasingSounds()
int8 queue = m_bActiveSampleQueue == 0; int8 queue = m_bActiveSampleQueue == 0;
for(int32 i = 0; i < m_bSampleRequestQueuesStatus[queue]; i++) { for(int32 i = 0; i < m_bSampleRequestQueuesStatus[queue]; i++) {
tActiveSample &sample = m_asSamples[queue][m_abSampleQueueIndexTable[queue][i]]; tSound &sample = m_asSamples[queue][m_abSampleQueueIndexTable[queue][i]];
if (sample.m_bLoopEnded) continue; if (sample.m_bLoopEnded) continue;
toProcess[i] = false; toProcess[i] = false;
@ -9438,7 +9438,7 @@ void
cAudioManager::AdjustSamplesVolume() cAudioManager::AdjustSamplesVolume()
{ {
for(int i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; i++) { for(int i = 0; i < m_bSampleRequestQueuesStatus[m_bActiveSampleQueue]; i++) {
tActiveSample* pSample = &m_asSamples[m_bActiveSampleQueue][m_abSampleQueueIndexTable[m_bActiveSampleQueue][i] + 1]; tSound* pSample = &m_asSamples[m_bActiveSampleQueue][m_abSampleQueueIndexTable[m_bActiveSampleQueue][i] + 1];
if(!pSample->m_bBankIndex) // all non-speech sounds on PC if(!pSample->m_bBankIndex) // all non-speech sounds on PC
pSample->m_bEmittingVolume = ComputeEmittingVolume( pSample->m_bEmittingVolume = ComputeEmittingVolume(

16
src/audio/AudioManager.h
View File

@ -131,7 +131,7 @@ enum eScriptSounds : int16
SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123, SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123,
}; };
class tActiveSample class tSound
{ {
public: public:
int32 m_nEntityIndex; int32 m_nEntityIndex;
@ -180,7 +180,7 @@ public:
// no methods // no methods
}; };
static_assert(sizeof(tActiveSample) == 92, "tActiveSample: error"); static_assert(sizeof(tSound) == 92, "tSound: error");
enum eAudioType : int32 enum eAudioType : int32
{ {
@ -363,14 +363,14 @@ enum AudioEntityHandle {
AEHANDLE_ERROR_BADAUDIOTYPE = -1, AEHANDLE_ERROR_BADAUDIOTYPE = -1,
}; };
struct Crime { struct cAMCrime {
int32 type; int32 type;
CVector position; CVector position;
uint16 timer; uint16 timer;
uint16 gap; uint16 gap;
}; };
static_assert(sizeof(Crime) == 20, "Crime: error "); static_assert(sizeof(cAMCrime) == 20, "cAMCrime: error ");
class cAudioManager class cAudioManager
{ {
@ -389,13 +389,13 @@ public:
uint8 field_14; uint8 field_14;
uint8 field_15; uint8 field_15;
int32 m_nTimer; int32 m_nTimer;
tActiveSample m_sQueueSample; tSound m_sQueueSample;
bool m_bActiveSampleQueue; bool m_bActiveSampleQueue;
uint8 gap_109[3]; uint8 gap_109[3];
tActiveSample m_asSamples[2][27]; tSound m_asSamples[2][27];
uint8 m_abSampleQueueIndexTable[2][27]; uint8 m_abSampleQueueIndexTable[2][27];
uint8 m_bSampleRequestQueuesStatus[2]; uint8 m_bSampleRequestQueuesStatus[2];
tActiveSample m_asActiveSamples[27]; tSound m_asActiveSamples[27];
tAudioEntity m_asAudioEntities[200]; tAudioEntity m_asAudioEntities[200];
int32 m_anAudioEntityIndices[200]; int32 m_anAudioEntityIndices[200];
int32 m_nAudioEntitiesTotal; int32 m_nAudioEntitiesTotal;
@ -412,7 +412,7 @@ public:
uint8 policeChannelTimerSeconds; uint8 policeChannelTimerSeconds;
uint8 policeChannelCounterSeconds; uint8 policeChannelCounterSeconds;
uint8 gap30; uint8 gap30;
Crime crimes[10]; cAMCrime crimes[10];
int32 m_nFrontEndEntity; int32 m_nFrontEndEntity;
int32 m_nCollisionEntity; int32 m_nCollisionEntity;
cAudioCollisionManager m_sCollisionManager; cAudioCollisionManager m_sCollisionManager;