isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-31 04:01:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-13 18:14:52 -05:00
parent a402be84a7
commit 46c44e86a0
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/legoeventnotificationparam.h
View File

@ -7,6 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
// VTABLE: LEGO1 0x100d6aa0 // VTABLE: LEGO1 0x100d6aa0
// SIZE 0x20
class LegoEventNotificationParam : public MxNotificationParam { class LegoEventNotificationParam : public MxNotificationParam {
public: public:
inline LegoEventNotificationParam() : MxNotificationParam(PARAM_NONE, NULL) {} inline LegoEventNotificationParam() : MxNotificationParam(PARAM_NONE, NULL) {}
@ -22,7 +23,6 @@ class LegoEventNotificationParam : public MxNotificationParam {
{ {
} }
virtual ~LegoEventNotificationParam() override {} // vtable+0x0 (scalar deleting destructor)
inline MxU8 GetKey() const { return m_key; } inline MxU8 GetKey() const { return m_key; }
protected: protected:
@ -33,4 +33,10 @@ class LegoEventNotificationParam : public MxNotificationParam {
MxU32 m_unk0x1c; // 0x1c MxU32 m_unk0x1c; // 0x1c
}; };
// SYNTHETIC: LEGO1 0x10028770
// LegoEventNotificationParam::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x100287e0
// LegoEventNotificationParam::~LegoEventNotificationParam
#endif // LEGOEVENTNOTIFICATIONPARAM_H #endif // LEGOEVENTNOTIFICATIONPARAM_H

2
LEGO1/lego/legoomni/src/main/legoomni.cpp
View File

@ -99,7 +99,7 @@ MxAtomId* g_testScript = NULL;
// GLOBAL: LEGO1 0x100f457c // GLOBAL: LEGO1 0x100f457c
MxAtomId* g_jukeboxwScript = NULL; MxAtomId* g_jukeboxwScript = NULL;
// GLOBAL: LEGO1 0x100f4580c // GLOBAL: LEGO1 0x100f4580
MxAtomId* g_sndAnimScript = NULL; MxAtomId* g_sndAnimScript = NULL;
// GLOBAL: LEGO1 0x100f4584 // GLOBAL: LEGO1 0x100f4584

3
LEGO1/omni/include/mxactionnotificationparam.h
View File

@ -115,6 +115,9 @@ class MxType4NotificationParam : public MxActionNotificationParam {
MxPresenter* m_unk0x14; // 0x14 MxPresenter* m_unk0x14; // 0x14
}; };
// SYNTHETIC: LEGO1 0x100511e0
// MxActionNotificationParam::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x100513a0 // SYNTHETIC: LEGO1 0x100513a0
// MxEndActionNotificationParam::`scalar deleting destructor' // MxEndActionNotificationParam::`scalar deleting destructor'

5
LEGO1/omni/include/mxnotificationparam.h
View File

@ -34,6 +34,7 @@ enum NotificationId {
}; };
// VTABLE: LEGO1 0x100d56e0 // VTABLE: LEGO1 0x100d56e0
// SIZE 0x0c
class MxNotificationParam : public MxParam { class MxNotificationParam : public MxParam {
public: public:
inline MxNotificationParam(NotificationId p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender) inline MxNotificationParam(NotificationId p_type, MxCore* p_sender) : MxParam(), m_type(p_type), m_sender(p_sender)
@ -48,8 +49,8 @@ class MxNotificationParam : public MxParam {
inline NotificationId GetType() const { return m_type; } inline NotificationId GetType() const { return m_type; }
protected: protected:
NotificationId m_type; // 0x4 NotificationId m_type; // 0x04
MxCore* m_sender; // 0x8 MxCore* m_sender; // 0x08
}; };
// SYNTHETIC: LEGO1 0x10010430 // SYNTHETIC: LEGO1 0x10010430

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

@ -2,10 +2,14 @@
#define MXPARAM_H #define MXPARAM_H
// VTABLE: LEGO1 0x100d56e8 // VTABLE: LEGO1 0x100d56e8
// SIZE 0x04
class MxParam { class MxParam {
public: public:
// FUNCTION: LEGO1 0x10010360 // FUNCTION: LEGO1 0x10010360
virtual ~MxParam() {} virtual ~MxParam() {}
}; };
// SYNTHETIC: LEGO1 0x10010370
// MxParam::`scalar deleting destructor'
#endif // MXPARAM_H #endif // MXPARAM_H