diff --git a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp index 60988521..49b4c28d 100644 --- a/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp +++ b/LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp @@ -319,6 +319,7 @@ void MxBackgroundAudioManager::LowerVolume() } // FUNCTION: LEGO1 0x1007f5b0 +// FUNCTION: BETA10 0x100e9543 void MxBackgroundAudioManager::RaiseVolume() { if (m_unk0x148 != 0) { diff --git a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp index 03c3e74f..7166ac08 100644 --- a/LEGO1/lego/legoomni/src/worlds/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/worlds/infocenter.cpp @@ -700,6 +700,7 @@ void Infocenter::InitializeBitmaps() } // FUNCTION: LEGO1 0x1006fd00 +// FUNCTION: BETA10 0x1002f808 MxU8 Infocenter::HandleMouseMove(MxS32 p_x, MxS32 p_y) { if (m_unk0x11c) { @@ -967,9 +968,10 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y) } // FUNCTION: LEGO1 0x10070370 +// FUNCTION: BETA10 0x1002ffd4 MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) { - if (p_param.GetUnknown0x28() == 1) { + if (p_param.m_unk0x28 == 1) { m_infoManDialogueTimer = 0; InfomainScript::Script actionToPlay = InfomainScript::c_noneInfomain; @@ -978,7 +980,7 @@ MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) LegoGameState* state = GameState(); - switch (p_param.GetClickedObjectId()) { + switch (p_param.m_clickedObjectId) { case InfomainScript::c_LeftArrow_Ctl: m_infocenterState->SetUnknown0x74(14); StopCurrentAction(); @@ -1143,8 +1145,11 @@ MxU8 Infocenter::HandleControl(LegoControlManagerNotificationParam& p_param) } // FUNCTION: LEGO1 0x10070870 +// FUNCTION: BETA10 0x1003039e MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param) { + // This function has changed significantly since BETA10 + // MxLong result MxCore* sender = p_param.GetSender(); @@ -1314,6 +1319,7 @@ MxBool Infocenter::VTable0x5c() } // FUNCTION: LEGO1 0x10070d10 +// FUNCTION: BETA10 0x100307d4 void Infocenter::FUN_10070d10(MxS32 p_x, MxS32 p_y) { MxS16 i; diff --git a/LEGO1/omni/include/mxpresenter.h b/LEGO1/omni/include/mxpresenter.h index 3af93fd0..3151704e 100644 --- a/LEGO1/omni/include/mxpresenter.h +++ b/LEGO1/omni/include/mxpresenter.h @@ -123,6 +123,8 @@ class MxPresenter : public MxCore { MxPoint32 GetLocation() const { return this->m_location; } MxS32 GetX() const { return this->m_location.GetX(); } MxS32 GetY() const { return this->m_location.GetY(); } + + // FUNCTION: BETA10 0x10031b70 MxS32 GetDisplayZ() const { return this->m_displayZ; } // FUNCTION: BETA10 0x10028430 @@ -135,6 +137,7 @@ class MxPresenter : public MxCore { m_compositePresenter = p_compositePresenter; } + // FUNCTION: BETA10 0x10031b40 void SetDisplayZ(MxS32 p_displayZ) { m_displayZ = p_displayZ; } // SYNTHETIC: LEGO1 0x1000c070 diff --git a/LEGO1/omni/src/video/mxvideomanager.cpp b/LEGO1/omni/src/video/mxvideomanager.cpp index 9c99f944..f6040ce8 100644 --- a/LEGO1/omni/src/video/mxvideomanager.cpp +++ b/LEGO1/omni/src/video/mxvideomanager.cpp @@ -96,6 +96,7 @@ void MxVideoManager::UpdateRegion() } // FUNCTION: LEGO1 0x100be440 +// FUNCTION: BETA10 0x1012ce5e void MxVideoManager::SortPresenterList() { if (this->m_presenters->GetCount() <= 1) {