mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-24 08:54:15 +00:00
Add various BETA10 references and fixes (#1398)
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
@@ -153,8 +153,15 @@ void Act2Actor::FUN_10018980()
|
||||
assert(m_shootAnim);
|
||||
|
||||
m_unk0x38 = SoundManager()->GetCacheSoundManager()->FindSoundByKey("xarrow");
|
||||
#ifdef BETA10
|
||||
// actually 0x2c and 0x30
|
||||
m_unk0x38 = SoundManager()->GetCacheSoundManager()->FindSoundByKey("bcrash");
|
||||
m_unk0x38->SetDistance(35, 60);
|
||||
m_unk0x38->SetDistance(35, 60);
|
||||
#else
|
||||
m_unk0x38->SetDistance(45, 55);
|
||||
m_roi->SetVisibility(TRUE);
|
||||
#endif
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x100189f0
|
||||
|
||||
@@ -296,6 +296,7 @@ void Lego3DSound::Reset()
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x10011cf0
|
||||
// FUNCTION: BETA10 0x10039fe0
|
||||
MxS32 Lego3DSound::SetDistance(MxS32 p_min, MxS32 p_max)
|
||||
{
|
||||
if (MxOmni::IsSound3D()) {
|
||||
|
||||
@@ -61,8 +61,11 @@ MxResult LegoCacheSoundManager::Tickle()
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x1003d170
|
||||
// FUNCTION: BETA10 0x1006539d
|
||||
LegoCacheSound* LegoCacheSoundManager::FindSoundByKey(const char* p_key)
|
||||
{
|
||||
// This function has changed completely since BETA10, but its calls suggest the match is correct
|
||||
|
||||
char* key = new char[strlen(p_key) + 1];
|
||||
strcpy(key, p_key);
|
||||
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
#include "mxautolock.h"
|
||||
#include "mxomni.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
DECOMP_SIZE_ASSERT(LegoSoundManager, 0x44)
|
||||
|
||||
// FUNCTION: LEGO1 0x100298a0
|
||||
@@ -37,6 +39,7 @@ void LegoSoundManager::Destroy(MxBool p_fromDestructor)
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x100299f0
|
||||
// FUNCTION: BETA10 0x100d0129
|
||||
MxResult LegoSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
|
||||
{
|
||||
MxBool locked = FALSE;
|
||||
@@ -67,6 +70,7 @@ MxResult LegoSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
|
||||
}
|
||||
|
||||
m_cacheSoundManager = new LegoCacheSoundManager;
|
||||
assert(m_cacheSoundManager);
|
||||
result = SUCCESS;
|
||||
}
|
||||
|
||||
@@ -83,12 +87,14 @@ done:
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x1002a390
|
||||
// FUNCTION: BETA10 0x100d02ed
|
||||
void LegoSoundManager::Destroy()
|
||||
{
|
||||
Destroy(FALSE);
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x1002a3a0
|
||||
// FUNCTION: BETA10 0x100d030d
|
||||
MxResult LegoSoundManager::Tickle()
|
||||
{
|
||||
MxSoundManager::Tickle();
|
||||
|
||||
Reference in New Issue
Block a user