diff --git a/src/CxbxKrnl/HLEDataBase.h b/src/CxbxKrnl/HLEDataBase.h index 78e271a33..d98197176 100644 --- a/src/CxbxKrnl/HLEDataBase.h +++ b/src/CxbxKrnl/HLEDataBase.h @@ -132,8 +132,7 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_Play, XREF_CMcpxBuffer_Stop, XREF_CDirectSoundBuffer_Stop, - XREF_DSFLUSHEX2, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundStream_FlushEx, XREF_CMcpxBuffer_SetBufferData, XREF_CDirectSoundBuffer_SetBufferData, XREF_CDirectSound_CreateSoundBuffer, @@ -157,10 +156,9 @@ enum XRefDataBaseOffset XREF_CMcpxAPU_ServiceDeferredCommandsLow, XREF_CDirectSound_SetAllParameters, XREF_CMcpxAPU_Set3dParameters, - XREF_DSSETHEADROOMA, XREF_CDirectSound_EnableHeadphones, - XREF_DSSYNCHPLAYBACKA, - XREF_DSSYNCHPLAYBACKB, + XREF_CDirectSound_SynchPlayback, + XREF_CMcpxAPU_SynchPlayback, XREF_DSSETI3DL2SOURCE1A, XREF_DSSETI3DL2SOURCE2A, XREF_CMcpxVoiceClient_SetPitch, @@ -213,9 +211,9 @@ enum XRefDataBaseOffset XREF_DS_CRefCount_AddRef, XREF_DS_CRefCount_Release, XREF_DSVOICESETMAXDISTANCE, - XREF_DSVOICESETROLLOFFCURVE, - XREF_DSVOICESETROLLOFFFACTOR, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetRolloffCurve, + XREF_CDirectSoundVoice_SetRolloffFactor, + XREF_CDirectSoundVoice_SetDistanceFactor, XREF_CDirectSoundVoice_SetConeAngles, XREF_CDirectSoundVoice_SetDopplerFactor, XREF_CMcpxVoiceClient_Set3dMode, @@ -223,15 +221,15 @@ enum XRefDataBaseOffset XREF_CDirectSoundBuffer_SetMode, XREF_CDirectSoundBuffer_SetMaxDistance, XREF_CDirectSoundBuffer_SetMinDistance, - XREF_DSBUFFERSETROLLOFFCURVE, - XREF_DSBUFFERSETROLLOFFFACTOR, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetRolloffCurve, + XREF_CDirectSoundBuffer_SetRolloffFactor, + XREF_CDirectSoundBuffer_SetDistanceFactor, XREF_CDirectSoundBuffer_SetConeAngles, XREF_CDirectSoundBuffer_SetConeOrientation, XREF_CDirectSoundBuffer_SetConeOutsideVolume, XREF_CDirectSoundBuffer_SetPosition, XREF_CDirectSoundBuffer_SetVelocity, - XREF_DSBUFFERSETDOPPLERFACTOR, + XREF_CDirectSoundBuffer_SetDopplerFactor, XREF_CDirectSoundBuffer_SetI3DL2Source, XREF_CDirectSoundVoice_SetFormat, XREF_CDirectSoundBuffer_SetFormat, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl index 55274505b..62ed9e044 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3911.inl @@ -1897,7 +1897,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 3911, 9, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundBuffer_SetBufferData, XRefZero) // CDirectSoundBuffer_SetBufferData+0x22 : cmp ecx, [eax+0x4C] @@ -1925,7 +1925,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3911, 1+9, XRefOne) // IDirectSoundBuffer_SetBufferData+0x18 : call [CDirectSoundBuffer_SetBufferData] - XREF_ENTRY( 0x19, XREF_DSSETBUFFERDATA ), + XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetBufferData ), // IDirectSoundBuffer_SetBufferData+0x04 : push [esp+0x0C] { 0x04, 0xFF }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl index 7e31b3b1c..7b45c0d37 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.3936.inl @@ -820,7 +820,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 3936, 9, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundBuffer_SetBufferData, XRefZero) // CDirectSoundBuffer_SetBufferData+0x22 : cmp ecx, [eax+0x4C] @@ -849,7 +849,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetBufferData, 3936, 1+9, XRefOne) // IDirectSoundBuffer_SetBufferData+0x18 : call [CDirectSoundBuffer_SetBufferData] - XREF_ENTRY( 0x19, XREF_DSSETBUFFERDATA ), + XREF_ENTRY( 0x19, XREF_CDirectSoundBuffer_SetBufferData ), // IDirectSoundBuffer_SetBufferData+0x04 : push [esp+0x0C] { 0x04, 0xFF }, @@ -2396,7 +2396,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetHeadroom, 3936, 10, - XREF_DSSETHEADROOMA, + XREF_CDirectSoundVoice_SetHeadroom, XRefZero) { 0x08, 0x54 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl index 7bf0f85f6..2c01c264a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4039.inl @@ -473,7 +473,7 @@ OOVPA_END; // Verified with Agent Under Fire. OOVPA_XREF(CDirectSoundBuffer_SetBufferData, 4039, 16, - XREF_DSSETBUFFERDATA, + XREF_CDirectSoundBuffer_SetBufferData, XRefZero) // CDirectSoundBuffer_SetBufferData+0x3D : mov eax, 0x80004005 diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl index d13ad832e..ad2658de1 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4134.inl @@ -1407,7 +1407,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 4134, 12, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] @@ -1435,11 +1435,11 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 4134, 1+9, - XREF_DSBUFFERSETROLLOFFFACTOR, + XREF_CDirectSoundBuffer_SetRolloffFactor, XRefOne) // CDirectSoundBuffer_SetRolloffFactor+0x39 : call [CDirectSoundVoice::SetRolloffFactor] - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffFactor ), // CDirectSoundBuffer_SetRolloffFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, @@ -1466,7 +1466,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 4134, 1+9, XRefOne) // IDirectSoundBuffer_SetRolloffFactor+0x1C : call [CDirectSoundBuffer::SetRolloffFactor] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffFactor ), // IDirectSoundBuffer_SetRolloffFactor+0x04 : fld [esp+4+arg_4] { 0x04, 0xD9 }, @@ -1492,7 +1492,7 @@ OOVPA_XREF(CDirectSoundStream_SetRolloffFactor, 4134, 1+8, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFFACTOR ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffFactor ), { 0x00, 0x56 }, { 0x0C, 0x00 }, @@ -1509,7 +1509,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4134, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] @@ -1537,11 +1537,11 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) // CDirectSoundBuffer_SetDistanceFactor+0x39 : call [CDirectSoundVoice::SetDistanceFactor] - XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), // CDirectSoundBuffer_SetDistanceFactor+0x21 : mov eax, 80004005h { 0x22, 0x05 }, @@ -1568,7 +1568,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 4134, 1+9, XRefOne) // IDirectSoundBuffer_SetDistanceFactor+0x1C : call [CDirectSoundBuffer::SetDistanceFactor] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDISTANCEFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), // IDirectSoundBuffer_SetDistanceFactor+0x04 : fld [esp+4+arg_4] { 0x04, 0xD9 }, @@ -1990,7 +1990,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 4134, 1+9, - XREF_DSBUFFERSETDOPPLERFACTOR, + XREF_CDirectSoundBuffer_SetDopplerFactor, XRefOne) // CDirectSoundBuffer_SetDopplerFactor+0x39 : call [CDirectSoundVoice::SetDopplerFactor] @@ -2021,7 +2021,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 4134, 1+8, XRefOne) // IDirectSoundBuffer_SetDopplerFactor+0x1C : call [CDirectSoundBuffer::SetDopplerFactor] - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDOPPLERFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDopplerFactor ), // IDirectSoundBuffer_SetDopplerFactor+0x08 : mov eax, [esp+4+arg_0] { 0x08, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl index 43b5c2702..ec66287ec 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4361.inl @@ -540,7 +540,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 4361, 12, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] @@ -568,7 +568,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4361, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl index 53a993977..9ad768e54 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.4627.inl @@ -874,7 +874,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_FlushEx, 4627, 14, - XREF_DSFLUSHEX2, + XREF_CDirectSoundStream_FlushEx, XRefZero) { 0x0F, 0x00 }, @@ -901,7 +901,7 @@ OOVPA_XREF(IDirectSoundStream_FlushEx, 4627, 1+8, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_DSFLUSHEX2 ), + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_FlushEx ), { 0x01, 0x74 }, { 0x04, 0xFF }, @@ -1074,7 +1074,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 4627, 11, - XREF_DSVOICESETROLLOFFCURVE, + XREF_CDirectSoundVoice_SetRolloffCurve, XRefZero) { 0x07, 0x8B }, @@ -1095,10 +1095,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetRolloffCurve, 4627, 1+7, - XREF_DSBUFFERSETROLLOFFCURVE, + XREF_CDirectSoundBuffer_SetRolloffCurve, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -1117,7 +1117,7 @@ OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 4627, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -1136,7 +1136,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetRolloffCurve, 4627, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFCURVE ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffCurve ), { 0x03, 0x10 }, { 0x08, 0xFF }, @@ -1347,7 +1347,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 4627, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) // CDirectSoundVoice_SetDistanceFactor+0x0D : mov edx, [esp+arg_4] diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl index 64ebaf3d2..b9dfb86e4 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5233.inl @@ -79,7 +79,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_FlushEx, 5233, 15, - XREF_DSFLUSHEX2, + XREF_CDirectSoundStream_FlushEx, XRefZero) { 0x24, 0xB8 }, @@ -112,7 +112,7 @@ OOVPA_XREF(IDirectSoundStream_FlushEx, 5233, 1+8, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_DSFLUSHEX2 ), + XREF_ENTRY( 0x11, XREF_CDirectSoundStream_FlushEx ), { 0x00, 0xFF }, { 0x03, 0x10 }, @@ -133,7 +133,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CMcpxAPU_SynchPlayback, 5233, 8, - XREF_DSSYNCHPLAYBACKB, + XREF_CMcpxAPU_SynchPlayback, XRefZero) { 0x0C, 0x74 }, @@ -151,10 +151,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSound_SynchPlayback, 5233, 1+9, - XREF_DSSYNCHPLAYBACKA, + XREF_CDirectSound_SynchPlayback, XRefOne) - XREF_ENTRY( 0x08, XREF_DSSYNCHPLAYBACKB ), + XREF_ENTRY( 0x08, XREF_CMcpxAPU_SynchPlayback ), // CDirectSound_SynchPlayback+0x00 : mov eax, [esp+0x04] { 0x00, 0x8B }, @@ -180,7 +180,7 @@ OOVPA_XREF(IDirectSound_SynchPlayback, 5233, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x11, XREF_DSSYNCHPLAYBACKA ), + XREF_ENTRY( 0x11, XREF_CDirectSound_SynchPlayback ), // IDirectSound_SynchPlayback+0x06 : add eax, 0xFFFFFFF8 { 0x06, 0x83 }, @@ -322,7 +322,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5233, 8, - XREF_DSVOICESETROLLOFFCURVE, + XREF_CDirectSoundVoice_SetRolloffCurve, XRefZero) { 0x07, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl index eb3c0a13e..1978a103a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5344.inl @@ -120,7 +120,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5344, 9, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) { 0x05, 0x41 }, @@ -139,10 +139,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5344, 1+7, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -161,7 +161,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5344, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDISTANCEFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -526,7 +526,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSound_SynchPlayback, 5344, 8, - XREF_DSSYNCHPLAYBACKA, + XREF_CDirectSound_SynchPlayback, XRefZero) { 0x07, 0x3D }, @@ -721,7 +721,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 5344, 12, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) // CDirectSoundVoice_SetRolloffFactor+0x0D : mov edx, [esp+arg_4] @@ -749,7 +749,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffCurve, 5344, 8, - XREF_DSVOICESETROLLOFFCURVE, + XREF_CDirectSoundVoice_SetRolloffCurve, XRefZero) { 0x07, 0x8B }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl index 64655d752..21484870a 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5558.inl @@ -36,7 +36,7 @@ // * CDirectSound::SynchPlayback // ****************************************************************** OOVPA_XREF(CDirectSound_SynchPlayback, 5558, 7, - XREF_DSSYNCHPLAYBACKA, + XREF_CDirectSound_SynchPlayback, XRefZero) { 0x0C, 0x00 }, @@ -707,7 +707,7 @@ OOVPA_XREF(CDirectSoundStream_SetMinDistance, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x16, 0x68 }, @@ -968,7 +968,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetDistanceFactor, 5558, 12, - XREF_DSVOICESETDISTANCEFACTOR, + XREF_CDirectSoundVoice_SetDistanceFactor, XRefZero) { 0x05, 0x41 }, @@ -990,10 +990,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetDistanceFactor, 5558, 1+7, - XREF_DSBUFFERSETDISTANCEFACTOR, + XREF_CDirectSoundBuffer_SetDistanceFactor, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETDISTANCEFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDistanceFactor ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -1012,7 +1012,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetDistanceFactor, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDISTANCEFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDistanceFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -1028,7 +1028,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetDopplerFactor, 5558, 1+7, - XREF_DSBUFFERSETDOPPLERFACTOR, + XREF_CDirectSoundBuffer_SetDopplerFactor, XRefOne) XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetDopplerFactor), @@ -1050,7 +1050,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetDopplerFactor, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETDOPPLERFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetDopplerFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -1492,7 +1492,7 @@ OOVPA_XREF(CDirectSoundStream_SetRolloffCurve, 5558, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x3E, XREF_DSVOICESETROLLOFFCURVE ), + XREF_ENTRY( 0x3E, XREF_CDirectSoundVoice_SetRolloffCurve ), { 0x0C, 0x00 }, { 0x16, 0x68 }, diff --git a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl index dc6088c07..82b5f7c82 100644 --- a/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/DSound.1.0.5788.inl @@ -366,7 +366,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundVoice_SetRolloffFactor, 5788, 7, - XREF_DSVOICESETROLLOFFFACTOR, + XREF_CDirectSoundVoice_SetRolloffFactor, XRefZero) { 0x05, 0x41 }, @@ -383,10 +383,10 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundBuffer_SetRolloffFactor, 5788, 1+7, - XREF_DSBUFFERSETROLLOFFFACTOR, + XREF_CDirectSoundBuffer_SetRolloffFactor, XRefOne) - XREF_ENTRY( 0x3A, XREF_DSVOICESETROLLOFFFACTOR ), + XREF_ENTRY( 0x3A, XREF_CDirectSoundVoice_SetRolloffFactor ), { 0x0C, 0x00 }, { 0x14, 0x74 }, @@ -405,7 +405,7 @@ OOVPA_XREF(IDirectSoundBuffer_SetRolloffFactor, 5788, 1+7, XRefNoSaveIndex, XRefOne) - XREF_ENTRY( 0x1D, XREF_DSBUFFERSETROLLOFFFACTOR ), + XREF_ENTRY( 0x1D, XREF_CDirectSoundBuffer_SetRolloffFactor ), { 0x03, 0x0C }, { 0x08, 0x8B }, @@ -497,7 +497,7 @@ OOVPA_END; // ****************************************************************** OOVPA_XREF(CDirectSoundStream_FlushEx, 5788, 7, - XREF_DSFLUSHEX2, + XREF_CDirectSoundStream_FlushEx, XRefZero) { 0x0F, 0x00 },