isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-27 18:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename notification type

Browse Source
This commit is contained in:
Christian Semmler 2024-05-01 08:54:03 -04:00
parent ccc0464f6a
commit 5ab1bc5038
14 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/helicopter.h
View File

@ -30,7 +30,7 @@ class Helicopter : public IslePathActor {
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74 void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxU32 VTable0xcc() override; // vtable+0xcc MxU32 VTable0xcc() override; // vtable+0xcc
MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4 MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8 MxU32 VTable0xd8(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
void VTable0xe4() override; // vtable+0xe4 void VTable0xe4() override; // vtable+0xe4
// SYNTHETIC: LEGO1 0x10003210 // SYNTHETIC: LEGO1 0x10003210

4
LEGO1/lego/legoomni/include/islepathactor.h
View File

@ -2,10 +2,10 @@
#define ISLEPATHACTOR_H #define ISLEPATHACTOR_H
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legoendanimnotificationparam.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legopathactor.h" #include "legopathactor.h"
#include "legoworld.h" #include "legoworld.h"
#include "mxtype18notificationparam.h"
#include "mxtype19notificationparam.h" #include "mxtype19notificationparam.h"
#include "mxtypes.h" #include "mxtypes.h"
@ -46,7 +46,7 @@ class IslePathActor : public LegoPathActor {
virtual MxU32 VTable0xd4(LegoControlManagerEvent&) { return 0; } // vtable+0xd4 virtual MxU32 VTable0xd4(LegoControlManagerEvent&) { return 0; } // vtable+0xd4
// FUNCTION: LEGO1 0x10002e90 // FUNCTION: LEGO1 0x10002e90
virtual MxU32 VTable0xd8(MxType18NotificationParam&) { return 0; } // vtable+0xd8 virtual MxU32 VTable0xd8(LegoEndAnimNotificationParam&) { return 0; } // vtable+0xd8
// FUNCTION: LEGO1 0x10002e00 // FUNCTION: LEGO1 0x10002e00
virtual MxU32 VTable0xdc(MxType19NotificationParam&) { return 0; } // vtable+0xdc virtual MxU32 VTable0xdc(MxType19NotificationParam&) { return 0; } // vtable+0xdc

34
LEGO1/lego/legoomni/include/legoendanimnotificationparam.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef LEGOENDANIMNOTIFICATIONPARAM_H
#define LEGOENDANIMNOTIFICATIONPARAM_H
#include "decomp.h"
#include "mxnotificationparam.h"
// VTABLE: LEGO1 0x100d7e80
// SIZE 0x10
class LegoEndAnimNotificationParam : public MxNotificationParam {
public:
LegoEndAnimNotificationParam(NotificationId p_type, MxCore* p_sender, MxU32 p_index)
: MxNotificationParam(p_type, p_sender), m_index(p_index)
{
}
// FUNCTION: LEGO1 0x1004afd0
MxNotificationParam* Clone() const override
{
return new LegoEndAnimNotificationParam(m_type, m_sender, m_index);
} // vtable+0x04
inline MxU32 GetIndex() { return m_index; }
protected:
MxU32 m_index; // 0x0c
};
// SYNTHETIC: LEGO1 0x1004b080
// LegoEndAnimNotificationParam::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x1004b0f0
// LegoEndAnimNotificationParam::~LegoEndAnimNotificationParam
#endif // LEGOENDANIMNOTIFICATIONPARAM_H

2
LEGO1/lego/legoomni/include/towtrack.h
View File

@ -28,7 +28,7 @@ class TowTrack : public IslePathActor {
void VTable0x70(float p_float) override; // vtable+0x70 void VTable0x70(float p_float) override; // vtable+0x70
MxU32 VTable0xcc() override; // vtable+0xcc MxU32 VTable0xcc() override; // vtable+0xcc
MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4 MxU32 VTable0xd4(LegoControlManagerEvent& p_param) override; // vtable+0xd4
MxU32 VTable0xd8(MxType18NotificationParam& p_param) override; // vtable+0xd8 MxU32 VTable0xd8(LegoEndAnimNotificationParam& p_param) override; // vtable+0xd8
MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc MxU32 VTable0xdc(MxType19NotificationParam& p_param) override; // vtable+0xdc
void VTable0xe4() override; // vtable+0xe4 void VTable0xe4() override; // vtable+0xe4

2
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@ -248,7 +248,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
} }
// FUNCTION: LEGO1 0x10003c20 // FUNCTION: LEGO1 0x10003c20
MxU32 Helicopter::VTable0xd8(MxType18NotificationParam& p_param) MxU32 Helicopter::VTable0xd8(LegoEndAnimNotificationParam& p_param)
{ {
MxU32 ret = 0; MxU32 ret = 0;

2
LEGO1/lego/legoomni/src/actors/isleactor.cpp
View File

@ -45,7 +45,7 @@ MxLong IsleActor::Notify(MxParam& p_param)
case c_notificationType11: case c_notificationType11:
result = VTable0x68(); result = VTable0x68();
break; break;
case c_notificationType18: case c_notificationEndAnim:
result = VTable0x70(); result = VTable0x70();
break; break;
case c_notificationType19: case c_notificationType19:

4
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View File

@ -47,8 +47,8 @@ MxLong IslePathActor::Notify(MxParam& p_param)
case c_notificationClick: case c_notificationClick:
ret = VTable0xd4((LegoControlManagerEvent&) p_param); ret = VTable0xd4((LegoControlManagerEvent&) p_param);
break; break;
case c_notificationType18: case c_notificationEndAnim:
ret = VTable0xd8((MxType18NotificationParam&) p_param); ret = VTable0xd8((LegoEndAnimNotificationParam&) p_param);
break; break;
case c_notificationType19: case c_notificationType19:
ret = VTable0xdc((MxType19NotificationParam&) p_param); ret = VTable0xdc((MxType19NotificationParam&) p_param);

2
LEGO1/lego/legoomni/src/actors/towtrack.cpp
View File

@ -37,7 +37,7 @@ MxLong TowTrack::Notify(MxParam& p_param)
} }
// STUB: LEGO1 0x1004cd30 // STUB: LEGO1 0x1004cd30
MxU32 TowTrack::VTable0xd8(MxType18NotificationParam& p_param) MxU32 TowTrack::VTable0xd8(LegoEndAnimNotificationParam& p_param)
{ {
// TODO // TODO
return 0; return 0;

8
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -928,15 +928,15 @@ LegoTranInfo* LegoAnimationManager::GetTranInfo(MxU32 p_index)
MxLong LegoAnimationManager::Notify(MxParam& p_param) MxLong LegoAnimationManager::Notify(MxParam& p_param)
{ {
if (((MxNotificationParam&) p_param).GetSender() == this) { if (((MxNotificationParam&) p_param).GetSender() == this) {
if (((MxNotificationParam&) p_param).GetType() == c_notificationType18) { if (((MxNotificationParam&) p_param).GetType() == c_notificationEndAnim) {
FUN_100605e0(m_unk0x18, TRUE, NULL, TRUE, NULL, FALSE, TRUE, TRUE, TRUE); FUN_100605e0(m_unk0x18, TRUE, NULL, TRUE, NULL, FALSE, TRUE, TRUE, TRUE);
} }
} }
else if (((MxNotificationParam&) p_param).GetType() == c_notificationType18 && m_tranInfoList != NULL) { else if (((MxNotificationParam&) p_param).GetType() == c_notificationEndAnim && m_tranInfoList != NULL) {
LegoTranInfoListCursor cursor(m_tranInfoList); LegoTranInfoListCursor cursor(m_tranInfoList);
LegoTranInfo* tranInfo; LegoTranInfo* tranInfo;
MxU32 index = ((MxType18NotificationParam&) p_param).GetUnknown0x0c(); MxU32 index = ((LegoEndAnimNotificationParam&) p_param).GetIndex();
MxBool found = FALSE; MxBool found = FALSE;
while (cursor.Next(tranInfo)) { while (cursor.Next(tranInfo)) {
@ -979,7 +979,7 @@ MxLong LegoAnimationManager::Notify(MxParam& p_param)
m_unk0x1a = FALSE; m_unk0x1a = FALSE;
} }
else { else {
MxType18NotificationParam param(c_notificationType18, this, 0); LegoEndAnimNotificationParam param(c_notificationEndAnim, this, 0);
NotificationManager()->Send(this, param); NotificationManager()->Send(this, param);
} }
} }

4
LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
View File

@ -5,6 +5,7 @@
#include "islepathactor.h" #include "islepathactor.h"
#include "legoanimationmanager.h" #include "legoanimationmanager.h"
#include "legoanimpresenter.h" #include "legoanimpresenter.h"
#include "legoendanimnotificationparam.h"
#include "legotraninfo.h" #include "legotraninfo.h"
#include "legovideomanager.h" #include "legovideomanager.h"
#include "legoworld.h" #include "legoworld.h"
@ -15,7 +16,6 @@
#include "mxnotificationmanager.h" #include "mxnotificationmanager.h"
#include "mxobjectfactory.h" #include "mxobjectfactory.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxtype18notificationparam.h"
#include "mxutilities.h" #include "mxutilities.h"
DECOMP_SIZE_ASSERT(LegoAnimMMPresenter, 0x74) DECOMP_SIZE_ASSERT(LegoAnimMMPresenter, 0x74)
@ -123,7 +123,7 @@ void LegoAnimMMPresenter::EndAction()
m_tranInfo = NULL; m_tranInfo = NULL;
MxType18NotificationParam param(c_notificationType18, NULL, m_animmanId); LegoEndAnimNotificationParam param(c_notificationEndAnim, NULL, m_animmanId);
if (m_animmanId != 0) { if (m_animmanId != 0) {
NotificationManager()->Send(AnimationManager(), param); NotificationManager()->Send(AnimationManager(), param);
} }

4
LEGO1/lego/legoomni/src/video/legoanimpresenter.cpp
View File

@ -4,6 +4,7 @@
#include "legoanimationmanager.h" #include "legoanimationmanager.h"
#include "legoanimmmpresenter.h" #include "legoanimmmpresenter.h"
#include "legocharactermanager.h" #include "legocharactermanager.h"
#include "legoendanimnotificationparam.h"
#include "legopathboundary.h" #include "legopathboundary.h"
#include "legovideomanager.h" #include "legovideomanager.h"
#include "legoworld.h" #include "legoworld.h"
@ -15,7 +16,6 @@
#include "mxnotificationmanager.h" #include "mxnotificationmanager.h"
#include "mxstreamchunk.h" #include "mxstreamchunk.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxtype18notificationparam.h"
#include "mxutilities.h" #include "mxutilities.h"
#include "mxvideomanager.h" #include "mxvideomanager.h"
#include "realtime/realtime.h" #include "realtime/realtime.h"
@ -1021,7 +1021,7 @@ void LegoAnimPresenter::EndAction()
LegoWorld* world = CurrentWorld(); LegoWorld* world = CurrentWorld();
if (world != NULL) { if (world != NULL) {
MxType18NotificationParam param(c_notificationType18, NULL, 0); LegoEndAnimNotificationParam param(c_notificationEndAnim, NULL, 0);
NotificationManager()->Send(world, param); NotificationManager()->Send(world, param);
} }

2
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@ -138,7 +138,7 @@ MxLong Isle::Notify(MxParam& p_param)
case c_notificationClick: case c_notificationClick:
result = HandleClick((LegoControlManagerEvent&) p_param); result = HandleClick((LegoControlManagerEvent&) p_param);
break; break;
case c_notificationType18: case c_notificationEndAnim:
switch (m_act1state->m_unk0x018) { switch (m_act1state->m_unk0x018) {
case 4: case 4:
result = CurrentActor()->Notify(p_param); result = CurrentActor()->Notify(p_param);

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

@ -7,6 +7,7 @@
class MxCore; class MxCore;
// Several of those should be defined in LegoOmni
enum NotificationId { enum NotificationId {
c_notificationType0 = 0, c_notificationType0 = 0,
c_notificationStartAction = 1, // 100dc210:100d8350 c_notificationStartAction = 1, // 100dc210:100d8350
@ -24,7 +25,7 @@ enum NotificationId {
c_notificationDrag = 14, c_notificationDrag = 14,
c_notificationTimer = 15, // 100d6aa0 c_notificationTimer = 15, // 100d6aa0
c_notificationClick = 17, c_notificationClick = 17,
c_notificationType18 = 18, // 100d7e80 c_notificationEndAnim = 18, // 100d7e80
c_notificationType19 = 19, // 100d6230 c_notificationType19 = 19, // 100d6230
c_notificationType20 = 20, c_notificationType20 = 20,
c_notificationNewPresenter = 21, c_notificationNewPresenter = 21,

34
LEGO1/omni/include/mxtype18notificationparam.h
View File

@ -1,34 +0,0 @@
#ifndef MXTYPE18NOTIFICATIONPARAM_H
#define MXTYPE18NOTIFICATIONPARAM_H
#include "decomp.h"
#include "mxnotificationparam.h"
// VTABLE: LEGO1 0x100d7e80
// SIZE 0x10
class MxType18NotificationParam : public MxNotificationParam {
public:
MxType18NotificationParam(NotificationId p_type, MxCore* p_sender, undefined4 p_unk0x0c)
: MxNotificationParam(p_type, p_sender), m_unk0x0c(p_unk0x0c)
{
}
// FUNCTION: LEGO1 0x1004afd0
MxNotificationParam* Clone() const override
{
return new MxType18NotificationParam(m_type, m_sender, m_unk0x0c);
} // vtable+0x04
inline undefined4 GetUnknown0x0c() { return m_unk0x0c; }
protected:
undefined4 m_unk0x0c; // 0x0c
};
// SYNTHETIC: LEGO1 0x1004b080
// MxType18NotificationParam::`scalar deleting destructor'
// SYNTHETIC: LEGO1 0x1004b0f0
// MxType18NotificationParam::~MxType18NotificationParam
#endif // MXTYPE18NOTIFICATIONPARAM_H