isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-26 17:36:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some issues with annotations (#808)

Browse source
This commit is contained in:
MS 2024-04-15 14:42:25 -04:00 committed by GitHub
parent 5f1642bf73
commit 46362a0f6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
LEGO1/lego/legoomni/include/legoanimpresenter.h
View file

@ -125,6 +125,15 @@ class LegoAnimPresenter : public MxVideoPresenter {
// TEMPLATE: LEGO1 0x10069d80 // TEMPLATE: LEGO1 0x10069d80
// _Tree<char const *,pair<char const * const,LegoAnimStruct>,map<char const *,LegoAnimStruct,LegoAnimStructComparator,allocator<LegoAnimStruct> >::_Kfn,LegoAnimStructComparator,allocator<LegoAnimStruct> >::~_Tree<char const *,pair<char const * const,LegoAni // _Tree<char const *,pair<char const * const,LegoAnimStruct>,map<char const *,LegoAnimStruct,LegoAnimStructComparator,allocator<LegoAnimStruct> >::_Kfn,LegoAnimStructComparator,allocator<LegoAnimStruct> >::~_Tree<char const *,pair<char const * const,LegoAni
// TEMPLATE: LEGO1 0x10069e50
// _Tree<char const *,pair<char const * const,LegoAnimStruct>,map<char const *,LegoAnimStruct,LegoAnimStructComparator,allocator<LegoAnimStruct> >::_Kfn,LegoAnimStructComparator,allocator<LegoAnimStruct> >::iterator::_Inc
// TEMPLATE: LEGO1 0x10069e90
// _Tree<char const *,pair<char const * const,LegoAnimStruct>,map<char const *,LegoAnimStruct,LegoAnimStructComparator,allocator<LegoAnimStruct> >::_Kfn,LegoAnimStructComparator,allocator<LegoAnimStruct> >::erase
// TEMPLATE: LEGO1 0x1006a2e0
// _Tree<char const *,pair<char const * const,LegoAnimStruct>,map<char const *,LegoAnimStruct,LegoAnimStructComparator,allocator<LegoAnimStruct> >::_Kfn,LegoAnimStructComparator,allocator<LegoAnimStruct> >::_Erase
// TEMPLATE: LEGO1 0x1006a320 // TEMPLATE: LEGO1 0x1006a320
// Map<char const *,LegoAnimStruct,LegoAnimStructComparator>::~Map<char const *,LegoAnimStruct,LegoAnimStructComparator> // Map<char const *,LegoAnimStruct,LegoAnimStructComparator>::~Map<char const *,LegoAnimStruct,LegoAnimStructComparator>

2
LEGO1/lego/legoomni/include/legobuildingmanager.h
View file

@ -33,7 +33,7 @@ class LegoBuildingManager : public MxCore {
MxResult Save(LegoStorage* p_storage); MxResult Save(LegoStorage* p_storage);
MxResult Load(LegoStorage* p_storage); MxResult Load(LegoStorage* p_storage);
MxBool FUN_1002fdb0(LegoEntity* p_entity); MxBool FUN_1002fdb0(LegoEntity* p_entity);
MxU32 FUN_1002ff40(LegoROI*, MxBool); MxU32 FUN_1002ff40(LegoEntity*, MxBool);
void FUN_10030000(LegoEntity* p_entity); void FUN_10030000(LegoEntity* p_entity);
void FUN_10030590(); void FUN_10030590();

2
LEGO1/lego/legoomni/include/legocachesoundmanager.h
View file

@ -100,7 +100,7 @@ class LegoCacheSoundManager {
// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::iterator::_Dec // _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::iterator::_Dec
// TEMPLATE: LEGO1 0x1003d740 // TEMPLATE: LEGO1 0x1003d740
// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_BuyNode // _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Buynode
// TEMPLATE: LEGO1 0x1003d760 // TEMPLATE: LEGO1 0x1003d760
// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Insert // _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Insert

2
LEGO1/lego/legoomni/include/legoplantmanager.h
View file

@ -30,7 +30,7 @@ class LegoPlantManager : public MxCore {
void Save(LegoStorage* p_storage); void Save(LegoStorage* p_storage);
MxResult Load(LegoStorage* p_storage); MxResult Load(LegoStorage* p_storage);
MxBool FUN_100269e0(LegoEntity* p_entity); MxBool FUN_100269e0(LegoEntity* p_entity);
MxU32 FUN_10026ba0(LegoROI*, MxBool); MxU32 FUN_10026ba0(LegoEntity*, MxBool);
void FUN_10026c50(LegoEntity* p_entity); void FUN_10026c50(LegoEntity* p_entity);
void FUN_10027120(); void FUN_10027120();

2
LEGO1/lego/legoomni/src/build/legobuildingmanager.cpp
View file

@ -64,7 +64,7 @@ MxBool LegoBuildingManager::FUN_1002fdb0(LegoEntity* p_entity)
} }
// STUB: LEGO1 0x1002ff40 // STUB: LEGO1 0x1002ff40
MxU32 LegoBuildingManager::FUN_1002ff40(LegoROI*, MxBool) MxU32 LegoBuildingManager::FUN_1002ff40(LegoEntity*, MxBool)
{ {
// TODO // TODO
return 0; return 0;

2
LEGO1/lego/legoomni/src/common/legoplantmanager.cpp
View file

@ -57,7 +57,7 @@ MxBool LegoPlantManager::FUN_100269e0(LegoEntity* p_entity)
} }
// STUB: LEGO1 0x10026ba0 // STUB: LEGO1 0x10026ba0
MxU32 LegoPlantManager::FUN_10026ba0(LegoROI*, MxBool) MxU32 LegoPlantManager::FUN_10026ba0(LegoEntity*, MxBool)
{ {
// TODO // TODO
return 0; return 0;

4
LEGO1/lego/legoomni/src/entity/legoentity.cpp
View file

@ -254,10 +254,10 @@ void LegoEntity::VTable0x34(MxBool p_und)
case 1: case 1:
break; break;
case 2: case 2:
objectId = PlantManager()->FUN_10026ba0(m_roi, p_und); objectId = PlantManager()->FUN_10026ba0(this, p_und);
break; break;
case 3: case 3:
objectId = BuildingManager()->FUN_1002ff40(m_roi, p_und); objectId = BuildingManager()->FUN_1002ff40(this, p_und);
break; break;
} }

5
LEGO1/omni/include/mxatom.h
View file

@ -120,4 +120,9 @@ class MxAtomId {
// TEMPLATE: LEGO1 0x100afe40 // TEMPLATE: LEGO1 0x100afe40
// Set<MxAtomIdCounter *,MxAtomIdCounterCompare>::~Set<MxAtomIdCounter *,MxAtomIdCounterCompare> // Set<MxAtomIdCounter *,MxAtomIdCounterCompare>::~Set<MxAtomIdCounter *,MxAtomIdCounterCompare>
// clang-format off
// GLOBAL: LEGO1 0x101013f0
// _Tree<MxAtomIdCounter *,MxAtomIdCounter *,set<MxAtomIdCounter *,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Kfn,MxAtomIdCounterCompare,allocator<MxAtomIdCounter *> >::_Nil
// clang-format on
#endif // MXATOM_H #endif // MXATOM_H

4
LEGO1/omni/src/video/mxbitmap.cpp
View file

@ -6,9 +6,7 @@
DECOMP_SIZE_ASSERT(MxBitmap, 0x20); DECOMP_SIZE_ASSERT(MxBitmap, 0x20);
DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428); DECOMP_SIZE_ASSERT(MxBITMAPINFO, 0x428);
// Bitmap header magic string "BM" (42 4d) // GLOBAL: LEGO1 0x10102184
// Sources: https://learn.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-bitmapfileheader, DirectX Complete
// (1998) GLOBAL: LEGO1 0x10102184
MxU16 g_bitmapSignature = TWOCC('B', 'M'); MxU16 g_bitmapSignature = TWOCC('B', 'M');
// FUNCTION: LEGO1 0x100bc980 // FUNCTION: LEGO1 0x100bc980