Fix member offset comments in collection classes

This commit is contained in:
disinvite 2023-11-19 00:05:06 -05:00
parent 3def0a0eb7
commit 28b7305296
5 changed files with 16 additions and 16 deletions

View File

@ -41,11 +41,11 @@ class LegoWorld : public LegoEntity {
void EndAction(MxPresenter* p_presenter); void EndAction(MxPresenter* p_presenter);
protected: protected:
LegoPathControllerList m_list0x68; // +0x68 LegoPathControllerList m_list0x68; // 0x68
MxPresenterList m_list0x80; // +0x80 MxPresenterList m_list0x80; // 0x80
LegoCameraController* m_camera; // +0x98 LegoCameraController* m_camera; // 0x98
undefined m_unk9c[0x1c]; undefined m_unk9c[0x1c];
MxPresenterList m_list0xb8; // +0xb8 MxPresenterList m_list0xb8; // 0xb8
undefined m_unkd0[0x26]; undefined m_unkd0[0x26];
undefined m_unkf6; undefined m_unkf6;
undefined m_unkf7; undefined m_unkf7;

View File

@ -18,8 +18,8 @@ class MxCollection : public MxCore {
virtual MxS8 Compare(T, T) { return 0; } virtual MxS8 Compare(T, T) { return 0; }
protected: protected:
MxU32 m_count; // +0x8 MxU32 m_count; // 0x8
void (*m_customDestructor)(T); // +0xc void (*m_customDestructor)(T); // 0xc
}; };
#endif // MXCOLLECTION_H #endif // MXCOLLECTION_H

View File

@ -59,16 +59,16 @@ class MxHashTable : protected MxCollection<T> {
protected: protected:
void _NodeInsert(MxHashTableNode<T>*); void _NodeInsert(MxHashTableNode<T>*);
MxHashTableNode<T>** m_slots; // +0x10 MxHashTableNode<T>** m_slots; // 0x10
MxU32 m_numSlots; // +0x14 MxU32 m_numSlots; // 0x14
MxU32 m_autoResizeRatio; // +0x18 MxU32 m_autoResizeRatio; // 0x18
HashTableOpt m_resizeOption; // +0x1c HashTableOpt m_resizeOption; // 0x1c
// FIXME: or FIXME? This qword is used as an integer or double depending // FIXME: or FIXME? This qword is used as an integer or double depending
// on the value of m_resizeOption. Hard to say whether this is how the devs // on the value of m_resizeOption. Hard to say whether this is how the devs
// did it, but a simple cast in either direction doesn't match. // did it, but a simple cast in either direction doesn't match.
union { union {
MxU32 m_increaseAmount; // +0x20 MxU32 m_increaseAmount; // 0x20
double m_increaseFactor; // +0x20 double m_increaseFactor; // 0x20
}; };
}; };

View File

@ -67,8 +67,8 @@ class MxList : protected MxCollection<T> {
friend class MxListCursor<T>; friend class MxListCursor<T>;
protected: protected:
MxListEntry<T>* m_first; // +0x10 MxListEntry<T>* m_first; // 0x10
MxListEntry<T>* m_last; // +0x14 MxListEntry<T>* m_last; // 0x14
void _DeleteEntry(MxListEntry<T>* match); void _DeleteEntry(MxListEntry<T>* match);
MxListEntry<T>* _InsertEntry(T, MxListEntry<T>*, MxListEntry<T>*); MxListEntry<T>* _InsertEntry(T, MxListEntry<T>*, MxListEntry<T>*);

View File

@ -17,8 +17,8 @@ class MxVariableTable : public MxHashTable<MxVariable*> {
// OFFSET: LEGO1 0x100afdb0 // OFFSET: LEGO1 0x100afdb0
static void Destroy(MxVariable* p_obj) { p_obj->Destroy(); } static void Destroy(MxVariable* p_obj) { p_obj->Destroy(); }
virtual MxS8 Compare(MxVariable*, MxVariable*) override; // +0x14 virtual MxS8 Compare(MxVariable*, MxVariable*) override; // vtable+0x14
virtual MxU32 Hash(MxVariable*) override; // +0x18 virtual MxU32 Hash(MxVariable*) override; // vtable+0x18
}; };
// OFFSET: LEGO1 0x100afcd0 TEMPLATE // OFFSET: LEGO1 0x100afcd0 TEMPLATE