From 46362a0f6e5d5019d4d9780252f0be3ad57fd75d Mon Sep 17 00:00:00 2001 From: MS Date: Mon, 15 Apr 2024 14:42:25 -0400 Subject: [PATCH] Fix some issues with annotations (#808) --- LEGO1/lego/legoomni/include/legoanimpresenter.h | 9 +++++++++ LEGO1/lego/legoomni/include/legobuildingmanager.h | 2 +- LEGO1/lego/legoomni/include/legocachesoundmanager.h | 2 +- LEGO1/lego/legoomni/include/legoplantmanager.h | 2 +- LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp | 2 +- LEGO1/lego/legoomni/src/common/legoplantmanager.cpp | 2 +- LEGO1/lego/legoomni/src/entity/legoentity.cpp | 4 ++-- LEGO1/omni/include/mxatom.h | 5 +++++ LEGO1/omni/src/video/mxbitmap.cpp | 4 +--- 9 files changed, 22 insertions(+), 10 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoanimpresenter.h b/LEGO1/lego/legoomni/include/legoanimpresenter.h index bea266d9..5e32e4fb 100644 --- a/LEGO1/lego/legoomni/include/legoanimpresenter.h +++ b/LEGO1/lego/legoomni/include/legoanimpresenter.h @@ -125,6 +125,15 @@ class LegoAnimPresenter : public MxVideoPresenter { // TEMPLATE: LEGO1 0x10069d80 // _Tree,map >::_Kfn,LegoAnimStructComparator,allocator >::~_Tree,map >::_Kfn,LegoAnimStructComparator,allocator >::iterator::_Inc + +// TEMPLATE: LEGO1 0x10069e90 +// _Tree,map >::_Kfn,LegoAnimStructComparator,allocator >::erase + +// TEMPLATE: LEGO1 0x1006a2e0 +// _Tree,map >::_Kfn,LegoAnimStructComparator,allocator >::_Erase + // TEMPLATE: LEGO1 0x1006a320 // Map::~Map diff --git a/LEGO1/lego/legoomni/include/legobuildingmanager.h b/LEGO1/lego/legoomni/include/legobuildingmanager.h index 2cdc7225..6e48c479 100644 --- a/LEGO1/lego/legoomni/include/legobuildingmanager.h +++ b/LEGO1/lego/legoomni/include/legobuildingmanager.h @@ -33,7 +33,7 @@ class LegoBuildingManager : public MxCore { MxResult Save(LegoStorage* p_storage); MxResult Load(LegoStorage* p_storage); MxBool FUN_1002fdb0(LegoEntity* p_entity); - MxU32 FUN_1002ff40(LegoROI*, MxBool); + MxU32 FUN_1002ff40(LegoEntity*, MxBool); void FUN_10030000(LegoEntity* p_entity); void FUN_10030590(); diff --git a/LEGO1/lego/legoomni/include/legocachesoundmanager.h b/LEGO1/lego/legoomni/include/legocachesoundmanager.h index 097cc41a..f326c35d 100644 --- a/LEGO1/lego/legoomni/include/legocachesoundmanager.h +++ b/LEGO1/lego/legoomni/include/legocachesoundmanager.h @@ -100,7 +100,7 @@ class LegoCacheSoundManager { // _Tree >::_Kfn,Set100d6b4cComparator,allocator >::iterator::_Dec // TEMPLATE: LEGO1 0x1003d740 -// _Tree >::_Kfn,Set100d6b4cComparator,allocator >::_BuyNode +// _Tree >::_Kfn,Set100d6b4cComparator,allocator >::_Buynode // TEMPLATE: LEGO1 0x1003d760 // _Tree >::_Kfn,Set100d6b4cComparator,allocator >::_Insert diff --git a/LEGO1/lego/legoomni/include/legoplantmanager.h b/LEGO1/lego/legoomni/include/legoplantmanager.h index 817157e7..e7a4d2d6 100644 --- a/LEGO1/lego/legoomni/include/legoplantmanager.h +++ b/LEGO1/lego/legoomni/include/legoplantmanager.h @@ -30,7 +30,7 @@ class LegoPlantManager : public MxCore { void Save(LegoStorage* p_storage); MxResult Load(LegoStorage* p_storage); MxBool FUN_100269e0(LegoEntity* p_entity); - MxU32 FUN_10026ba0(LegoROI*, MxBool); + MxU32 FUN_10026ba0(LegoEntity*, MxBool); void FUN_10026c50(LegoEntity* p_entity); void FUN_10027120(); diff --git a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp index 989beb05..b4c24adc 100644 --- a/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp +++ b/LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp @@ -64,7 +64,7 @@ MxBool LegoBuildingManager::FUN_1002fdb0(LegoEntity* p_entity) } // STUB: LEGO1 0x1002ff40 -MxU32 LegoBuildingManager::FUN_1002ff40(LegoROI*, MxBool) +MxU32 LegoBuildingManager::FUN_1002ff40(LegoEntity*, MxBool) { // TODO return 0; diff --git a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp index b51a1ec7..09e26a06 100644 --- a/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoplantmanager.cpp @@ -57,7 +57,7 @@ MxBool LegoPlantManager::FUN_100269e0(LegoEntity* p_entity) } // STUB: LEGO1 0x10026ba0 -MxU32 LegoPlantManager::FUN_10026ba0(LegoROI*, MxBool) +MxU32 LegoPlantManager::FUN_10026ba0(LegoEntity*, MxBool) { // TODO return 0; diff --git a/LEGO1/lego/legoomni/src/entity/legoentity.cpp b/LEGO1/lego/legoomni/src/entity/legoentity.cpp index 0349aa61..5b121c3a 100644 --- a/LEGO1/lego/legoomni/src/entity/legoentity.cpp +++ b/LEGO1/lego/legoomni/src/entity/legoentity.cpp @@ -254,10 +254,10 @@ void LegoEntity::VTable0x34(MxBool p_und) case 1: break; case 2: - objectId = PlantManager()->FUN_10026ba0(m_roi, p_und); + objectId = PlantManager()->FUN_10026ba0(this, p_und); break; case 3: - objectId = BuildingManager()->FUN_1002ff40(m_roi, p_und); + objectId = BuildingManager()->FUN_1002ff40(this, p_und); break; } diff --git a/LEGO1/omni/include/mxatom.h b/LEGO1/omni/include/mxatom.h index 4f00b23f..2693dd96 100644 --- a/LEGO1/omni/include/mxatom.h +++ b/LEGO1/omni/include/mxatom.h @@ -120,4 +120,9 @@ class MxAtomId { // TEMPLATE: LEGO1 0x100afe40 // Set::~Set +// clang-format off +// GLOBAL: LEGO1 0x101013f0 +// _Tree >::_Kfn,MxAtomIdCounterCompare,allocator >::_Nil +// clang-format on + #endif // MXATOM_H diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp index 983dece4..3ec0ece1 100644 --- a/LEGO1/omni/src/video/mxbitmap.cpp +++ b/LEGO1/omni/src/video/mxbitmap.cpp @@ -6,9 +6,7 @@ DECOMP_SIZE_ASSERT(MxBitmap, 0x20); DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428); -// Bitmap header magic string "BM" (42 4d) -// Sources: https://learn.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-bitmapfileheader, DirectX Complete -// (1998) GLOBAL: LEGO1 0x10102184 +// GLOBAL: LEGO1 0x10102184 MxU16 g_bitmapSignature = TWOCC('B', 'M'); // FUNCTION: LEGO1 0x100bc980