TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename SetUnknown84 to SetNotificationObject (#1474)

Browse Source
This commit is contained in:
Florian Kaiser 2025-05-12 17:20:38 +02:00 committed by GitHub
parent 81f28f149f
commit e59345c88c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/audio/mxbackgroundaudiomanager.cpp
View File

@ -261,7 +261,7 @@ MxResult MxBackgroundAudioManager::PlayMusic(
m_action2.SetAtomId(p_action.GetAtomId());
m_action2.SetObjectId(p_action.GetObjectId());
m_action2.SetUnknown84(this);
m_action2.SetNotificationObject(this);
m_action2.SetOrigin(this);
MxResult result = Start(&m_action2);

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

@ -146,7 +146,7 @@ void Score::ReadyWorld()
MxDSAction action;
action.SetObjectId(InfoscorScript::c_nin001pr_RunAnim);
action.SetAtomId(m_atomId);
action.SetUnknown84(this);
action.SetNotificationObject(this);
Start(&action);
if (m_state->GetTutorialFlag()) {

32
LEGO1/omni/include/mxdsaction.h
View File

@ -104,8 +104,8 @@ public:
// FUNCTION: BETA10 0x10015430
void SetUp(const Vector3& p_up) { m_up = p_up; }
MxCore* GetUnknown84() { return m_unk0x84; }
void SetUnknown84(MxCore* p_unk0x84) { m_unk0x84 = p_unk0x84; }
MxCore* GetNotificationObject() { return m_notificationObject; }
void SetNotificationObject(MxCore* p_notificationObject) { m_notificationObject = p_notificationObject; }
MxCore* GetOrigin() { return m_origin; }
void SetOrigin(MxCore* p_origin) { m_origin = p_origin; }
@ -117,20 +117,20 @@ public:
// MxDSAction::`scalar deleting destructor'
protected:
MxU32 m_sizeOnDisk; // 0x2c
MxU32 m_flags; // 0x30
MxLong m_startTime; // 0x34
MxLong m_duration; // 0x38
MxS32 m_loopCount; // 0x3c
Mx3DPointFloat m_location; // 0x40
Mx3DPointFloat m_direction; // 0x54
Mx3DPointFloat m_up; // 0x68
char* m_extraData; // 0x7c
MxU16 m_extraLength; // 0x80
MxCore* m_unk0x84; // 0x84
undefined4 m_unk0x88; // 0x88
MxCore* m_origin; // 0x8c
MxLong m_unk0x90; // 0x90
MxU32 m_sizeOnDisk; // 0x2c
MxU32 m_flags; // 0x30
MxLong m_startTime; // 0x34
MxLong m_duration; // 0x38
MxS32 m_loopCount; // 0x3c
Mx3DPointFloat m_location; // 0x40
Mx3DPointFloat m_direction; // 0x54
Mx3DPointFloat m_up; // 0x68
char* m_extraData; // 0x7c
MxU16 m_extraLength; // 0x80
MxCore* m_notificationObject; // 0x84
undefined4 m_unk0x88; // 0x88
MxCore* m_origin; // 0x8c
MxLong m_unk0x90; // 0x90
};
#endif // MXDSACTION_H

4
LEGO1/omni/src/action/mxdsaction.cpp
View File

@ -28,7 +28,7 @@ MxDSAction::MxDSAction()
m_location.Fill(FLT_MAX);
m_direction.Fill(FLT_MAX);
m_up.Fill(FLT_MAX);
m_unk0x84 = NULL;
m_notificationObject = NULL;
m_unk0x88 = 0;
m_origin = NULL;
m_unk0x90 = INT_MIN;
@ -89,7 +89,7 @@ void MxDSAction::CopyFrom(MxDSAction& p_dsAction)
m_direction = p_dsAction.m_direction;
m_up = p_dsAction.m_up;
AppendExtra(p_dsAction.m_extraLength, p_dsAction.m_extraData);
m_unk0x84 = p_dsAction.m_unk0x84;
m_notificationObject = p_dsAction.m_notificationObject;
m_unk0x88 = p_dsAction.m_unk0x88;
m_origin = p_dsAction.m_origin;
m_unk0x90 = p_dsAction.m_unk0x90;

4
LEGO1/omni/src/main/mxomni.cpp
View File

@ -271,9 +271,9 @@ MxResult MxOmni::CreatePresenter(MxStreamController* p_controller, MxDSAction& p
NotificationManager()->Send(sender, MxType4NotificationParam(this, &p_action, object));
}
if (p_action.GetUnknown84()) {
if (p_action.GetNotificationObject()) {
NotificationManager()->Send(
p_action.GetUnknown84(),
p_action.GetNotificationObject(),
MxStartActionNotificationParam(c_notificationStartAction, object, &p_action, FALSE)
);
}

2
LEGO1/omni/src/stream/mxdiskstreamcontroller.cpp
View File

@ -316,7 +316,7 @@ MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
if (entry) {
MxDSStreamingAction* action = new MxDSStreamingAction(*p_action, 0);
action->SetUnknown28(entry->GetUnknown28());
action->SetUnknown84(entry->GetUnknown84());
action->SetNotificationObject(entry->GetNotificationObject());
action->SetOrigin(entry->GetOrigin());
action->SetUnknowna0(entry->GetUnknowna4());

2
LEGO1/omni/src/stream/mxdsbuffer.cpp
View File

@ -207,7 +207,7 @@ MxResult MxDSBuffer::StartPresenterFromAction(
if (!m_unk0x30->GetInternalAction()) {
p_objectheader->SetAtomId(p_action1->GetAtomId());
p_objectheader->SetUnknown28(p_action1->GetUnknown28());
p_objectheader->SetUnknown84(p_action1->GetUnknown84());
p_objectheader->SetNotificationObject(p_action1->GetNotificationObject());
p_objectheader->SetOrigin(p_action1->GetOrigin());
p_objectheader->SetUnknown90(p_action1->GetUnknown90());
p_objectheader->MergeFrom(*p_action1);