Merge remote-tracking branch 'upstream/master' into impl/legoinputmanager-procevent

This commit is contained in:
Misha 2024-01-28 07:41:36 -05:00
commit ca6d3e4e85
No known key found for this signature in database
GPG Key ID: 8441D12AEF33FED8
2 changed files with 9 additions and 8 deletions

View File

@ -11,7 +11,14 @@
// SIZE 0x20
class LegoEventNotificationParam : public MxNotificationParam {
public:
virtual MxNotificationParam* Clone() override; // vtable+0x4
// FUNCTION: LEGO1 0x10028690
virtual MxNotificationParam* Clone() override
{
LegoEventNotificationParam* clone =
new LegoEventNotificationParam(m_type, m_sender, m_modifier, m_x, m_y, m_key);
clone->m_unk0x1c = m_unk0x1c;
return clone;
}; // vtable+0x4
inline LegoEventNotificationParam() : MxNotificationParam(c_notificationType0, NULL) {}
inline LegoEventNotificationParam(
@ -26,6 +33,7 @@ class LegoEventNotificationParam : public MxNotificationParam {
{
}
inline MxU8 GetModifier() { return m_modifier; }
inline MxU8 GetKey() const { return m_key; }
inline MxS32 GetX() const { return m_x; }
inline MxS32 GetY() const { return m_y; }

View File

@ -3,10 +3,3 @@
#include "decomp.h"
DECOMP_SIZE_ASSERT(LegoEventNotificationParam, 0x20);
// STUB: LEGO1 0x10028690
MxNotificationParam* LegoEventNotificationParam::Clone()
{
// TODO
return NULL;
}