mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ambiguous matches in BETA10 (#1520)

Browse Source 
* Fix ambiguous matches in BETA10

* Add more functions, fix one LINE annotation

* Fix LEGO1 matches

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2025-05-26 07:25:47 +02:00
committed by GitHub
parent 5ad885f958
commit f7744f5550
8 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/omni/include/mxatom.h
View File

@@ -143,8 +143,10 @@ private:
// clang-format off
// TEMPLATE: LEGO1 0x100af7e0
// ?erase@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QAE?AViterator@1@V21@@Z
// TEMPLATE: BETA10 0x10131210
// _Tree<MxAtom *,MxAtom *,set<MxAtom *,MxAtomCompare,allocator<MxAtom *> >::_Kfn,MxAtomCompare,allocator<MxAtom *> >::erase
// ?erase@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QAE?AViterator@1@V21@0@Z
// clang-format on
// clang-format off
@@ -178,7 +180,9 @@ private:
// clang-format off
// TEMPLATE: BETA10 0x10132170
// _Tree<MxAtom *,MxAtom *,set<MxAtom *,MxAtomCompare,allocator<MxAtom *> >::_Kfn,MxAtomCompare,allocator<MxAtom *> >::begin
// ?begin@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QAE?AViterator@1@XZ
// Note: could also be
// ?begin@?$_Tree@PAVMxAtom@@PAV1@U_Kfn@?$set@PAVMxAtom@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@UMxAtomCompare@@V?$allocator@PAVMxAtom@@@@@@QBE?AVconst_iterator@1@XZ
// clang-format on
// TEMPLATE: BETA10 0x101321d0

2
LEGO1/omni/include/mxparam.h
View File

@@ -14,7 +14,7 @@ public:
};
// SYNTHETIC: BETA10 0x10013710
// MxParam::MxParam
// ??0MxParam@@QAE@XZ
// SYNTHETIC: ISLE 0x401540
// SYNTHETIC: LEGO1 0x10010370

2
LEGO1/omni/include/mxpresenterlist.h
View File

@@ -107,6 +107,6 @@ public:
// MxListCursor<MxPresenter *>::MxListCursor<MxPresenter *>
// TEMPLATE: BETA10 0x100d9420
// MxListCursor<MxPresenter *>::Prev
// ?Prev@?$MxListCursor@PAVMxPresenter@@@@QAEEAAPAVMxPresenter@@@Z
#endif // MXPRESENTERLIST_H

2
LEGO1/omni/include/mxstreamer.h
View File

@@ -134,7 +134,7 @@ private:
// list<MxStreamController *,allocator<MxStreamController *> >::end
// TEMPLATE: BETA10 0x101461b0
// list<MxStreamController *,allocator<MxStreamController *> >::iterator::operator++
// ??Eiterator@?$list@PAVMxStreamController@@V?$allocator@PAVMxStreamController@@@@@@QAE?AV01@H@Z
// SYNTHETIC: LEGO1 0x100b9120
// SYNTHETIC: BETA10 0x101466e0

2
LEGO1/omni/src/video/flic.cpp
View File

@@ -364,10 +364,10 @@ void DecodeSS2(LPBITMAPINFOHEADER p_bitmapHeader, BYTE* p_pixelData, BYTE* p_dat
// LINE: BETA10 0x1013e643
short xmax = xofs + width - 1;
// LINE: BETA10 0x1013e652
union {
BYTE* byte;
WORD* word;
// LINE: BETA10 0x1013e652
} data = {p_data};
// The first word in the data following the chunk header contains the number of lines in the chunk.