From 32ad237d90daa8d8125270d2d7d18ede90510b11 Mon Sep 17 00:00:00 2001 From: jonschz Date: Fri, 13 Sep 2024 21:26:59 +0200 Subject: [PATCH] Add BETA10 annotations --- LEGO1/lego/legoomni/include/legoeventnotificationparam.h | 2 ++ LEGO1/lego/legoomni/include/legoutils.h | 2 +- LEGO1/lego/legoomni/src/common/legogamestate.cpp | 1 + LEGO1/lego/legoomni/src/common/legoutils.cpp | 2 +- LEGO1/lego/legoomni/src/entity/legoworld.cpp | 7 +++++-- LEGO1/mxgeometry/mxmatrix.h | 1 + LEGO1/realtime/matrix.h | 2 ++ LEGO1/realtime/orientableroi.cpp | 1 + 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h index f7c00b48..cbb12b61 100644 --- a/LEGO1/lego/legoomni/include/legoeventnotificationparam.h +++ b/LEGO1/lego/legoomni/include/legoeventnotificationparam.h @@ -46,9 +46,11 @@ class LegoEventNotificationParam : public MxNotificationParam { MxU8 GetKey() const { return m_key; } // FUNCTION: LEGO1 0x10012190 + // FUNCTION: BETA10 0x10024210 MxS32 GetX() const { return m_x; } // FUNCTION: LEGO1 0x100121a0 + // FUNCTION: BETA10 0x10024240 MxS32 GetY() const { return m_y; } void SetROI(LegoROI* p_roi) { m_roi = p_roi; } diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h index ee0a001d..9e8c91fc 100644 --- a/LEGO1/lego/legoomni/include/legoutils.h +++ b/LEGO1/lego/legoomni/include/legoutils.h @@ -40,7 +40,7 @@ LegoEntity* PickEntity(MxLong, MxLong); LegoROI* PickROI(MxLong, MxLong); LegoROI* PickParentROI(MxLong p_a, MxLong p_b); void FUN_1003dde0(LegoROI* p_param1, MxFloat p_param2); -MxBool FUN_1003ded0(MxFloat p_param1[3], MxFloat p_param2[3], MxFloat p_param3[3]); +MxBool FUN_1003ded0(MxFloat p_param1[2], MxFloat p_param2[3], MxFloat p_param3[3]); MxBool TransformWorldToScreen(const MxFloat p_world[3], MxFloat p_screen[4]); MxS16 CountTotalTreeNodes(LegoTreeNode* p_node); void FUN_1003e050(LegoAnimPresenter* p_presenter); diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index 75f0ba2a..a4001bc2 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -792,6 +792,7 @@ inline void LoadIsle() } // FUNCTION: LEGO1 0x1003b060 +// FUNCTION: BETA10 0x10085adf void LegoGameState::SwitchArea(Area p_area) { m_previousArea = m_currentArea; diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index eeca0bd0..c2dcdf50 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -70,7 +70,7 @@ void FUN_1003dde0(LegoROI* p_param1, MxFloat p_param2) // FUNCTION: LEGO1 0x1003ded0 // FUNCTION: BETA10 0x100d3802 -MxBool FUN_1003ded0(MxFloat p_param1[3], MxFloat p_param2[3], MxFloat p_param3[3]) +MxBool FUN_1003ded0(MxFloat p_param1[2], MxFloat p_param2[3], MxFloat p_param3[3]) { MxFloat local1c[4]; MxFloat local10[3]; diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp index b8cdc37e..8641e196 100644 --- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp @@ -224,6 +224,7 @@ void LegoWorld::Destroy(MxBool p_fromDestructor) } // FUNCTION: LEGO1 0x1001f5e0 +// FUNCTION: BETA10 0x100d9f5f MxLong LegoWorld::Notify(MxParam& p_param) { MxLong result = 0; @@ -441,7 +442,8 @@ void LegoWorld::Add(MxCore* p_object) m_entityList->Append((LegoEntity*) p_object); } - else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || p_object->IsA("LegoLoopingAnimPresenter")) { + else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || + p_object->IsA("LegoLoopingAnimPresenter")) { MxPresenterListCursor cursor(&m_animPresenters); if (cursor.Find((MxPresenter*) p_object)) { @@ -495,7 +497,8 @@ void LegoWorld::Remove(MxCore* p_object) ((MxControlPresenter*) p_object)->VTable0x68(TRUE); } } - else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || p_object->IsA("LegoLoopingAnimPresenter")) { + else if (p_object->IsA("LegoLocomotionAnimPresenter") || p_object->IsA("LegoHideAnimPresenter") || + p_object->IsA("LegoLoopingAnimPresenter")) { MxPresenterListCursor cursor(&m_animPresenters); if (cursor.Find((MxPresenter*) p_object)) { diff --git a/LEGO1/mxgeometry/mxmatrix.h b/LEGO1/mxgeometry/mxmatrix.h index 5f471a8d..5ac9b2be 100644 --- a/LEGO1/mxgeometry/mxmatrix.h +++ b/LEGO1/mxgeometry/mxmatrix.h @@ -9,6 +9,7 @@ class MxMatrix : public Matrix4 { public: // FUNCTION: LEGO1 0x1006b120 + // FUNCTION: BETA10 0x10015370 MxMatrix() : Matrix4(m_elements) {} // FUNCTION: LEGO1 0x10032770 diff --git a/LEGO1/realtime/matrix.h b/LEGO1/realtime/matrix.h index a0508c4d..181acedf 100644 --- a/LEGO1/realtime/matrix.h +++ b/LEGO1/realtime/matrix.h @@ -18,6 +18,7 @@ struct UnknownMatrixType { class Matrix4 { public: // FUNCTION: LEGO1 0x10004500 + // FUNCTION: BETA10 0x1000fc70 Matrix4(float (*p_data)[4]) { SetData(p_data); } // Note: virtual function overloads appear in the virtual table @@ -27,6 +28,7 @@ class Matrix4 { virtual void Equals(float (*p_data)[4]) { memcpy(m_data, p_data, sizeof(float) * 4 * 4); } // vtable+0x04 // FUNCTION: LEGO1 0x10002340 + // FUNCTION: BETA10 0x1000fcf0 virtual void Equals(const Matrix4& p_matrix) { memcpy(m_data, p_matrix.m_data, sizeof(float) * 4 * 4); diff --git a/LEGO1/realtime/orientableroi.cpp b/LEGO1/realtime/orientableroi.cpp index 451df324..9946e78e 100644 --- a/LEGO1/realtime/orientableroi.cpp +++ b/LEGO1/realtime/orientableroi.cpp @@ -22,6 +22,7 @@ OrientableROI::OrientableROI() // Maybe an overload based on MxMatrix type // FUNCTION: LEGO1 0x100a46a0 +// FUNCTION: BETA10 0x10165268 void OrientableROI::WrappedSetLocalTransform(const Matrix4& p_transform) { SetLocalTransform(p_transform);