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

Fix MxParam p

Browse Source
This commit is contained in:
Christian Semmler 2023-12-12 06:15:58 -05:00
parent acd6d119a3
commit d511461bb0
45 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/act2brick.cpp
View File

@ -21,7 +21,7 @@ MxResult Act2Brick::Tickle()
}
// STUB: LEGO1 0x1007a8c0
MxLong Act2Brick::Notify(MxParam& p)
MxLong Act2Brick::Notify(MxParam& p_param)
{
// TODO

4
LEGO1/act2brick.h
View File

@ -10,8 +10,8 @@ class Act2Brick : public LegoPathActor {
Act2Brick();
virtual ~Act2Brick() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x08
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1007a360
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/act2policestation.cpp
View File

@ -1,7 +1,7 @@
#include "act2policestation.h"
// STUB: LEGO1 0x1004e0e0
MxLong Act2PoliceStation::Notify(MxParam& p)
MxLong Act2PoliceStation::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/act2policestation.h
View File

@ -7,7 +7,7 @@
// SIZE 0x68
class Act2PoliceStation : public LegoEntity {
public:
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x1000e200
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/beachhouseentity.cpp
View File

@ -1,7 +1,7 @@
#include "beachhouseentity.h"
// STUB: LEGO1 0x100150a0
MxLong BeachHouseEntity::Notify(MxParam& p)
MxLong BeachHouseEntity::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/beachhouseentity.h
View File

@ -7,7 +7,7 @@
// SIZE 0x68
class BeachHouseEntity : public BuildingEntity {
public:
virtual MxLong Notify(MxParam& p) override; // vtable+04
virtual MxLong Notify(MxParam& p_param) override; // vtable+04
// FUNCTION: LEGO1 0x1000ee80
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/elevatorbottom.cpp
View File

@ -13,7 +13,7 @@ ElevatorBottom::~ElevatorBottom()
}
// STUB: LEGO1 0x10018150
MxLong ElevatorBottom::Notify(MxParam& p)
MxLong ElevatorBottom::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/elevatorbottom.h
View File

@ -9,7 +9,7 @@ class ElevatorBottom : public LegoWorld {
ElevatorBottom();
virtual ~ElevatorBottom() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x10017f20
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/gasstation.cpp
View File

@ -13,7 +13,7 @@ GasStation::~GasStation()
}
// STUB: LEGO1 0x10004a60
MxLong GasStation::Notify(MxParam& p)
MxLong GasStation::Notify(MxParam& p_param)
{
// TODO

4
LEGO1/gasstation.h
View File

@ -11,8 +11,8 @@ class GasStation : public LegoWorld {
GasStation();
virtual ~GasStation() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
// FUNCTION: LEGO1 0x10004780
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/historybook.cpp
View File

@ -13,7 +13,7 @@ HistoryBook::~HistoryBook()
}
// STUB: LEGO1 0x10082680
MxLong HistoryBook::Notify(MxParam& p)
MxLong HistoryBook::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/historybook.h
View File

@ -10,7 +10,7 @@ class HistoryBook : public LegoWorld {
HistoryBook();
virtual ~HistoryBook() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x10082390
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/hospital.cpp
View File

@ -13,7 +13,7 @@ Hospital::~Hospital()
}
// STUB: LEGO1 0x10074990
MxLong Hospital::Notify(MxParam& p)
MxLong Hospital::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/hospital.h
View File

@ -10,7 +10,7 @@ class Hospital : public LegoWorld {
Hospital();
virtual ~Hospital() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x04
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x100746b0
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/infocenter.cpp
View File

@ -13,7 +13,7 @@ Infocenter::~Infocenter()
}
// STUB: LEGO1 0x1006ef10
MxLong Infocenter::Notify(MxParam& p)
MxLong Infocenter::Notify(MxParam& p_param)
{
// TODO

4
LEGO1/infocenter.h
View File

@ -10,8 +10,8 @@ class Infocenter : public LegoWorld {
Infocenter();
virtual ~Infocenter() override;
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
// FUNCTION: LEGO1 0x1006eb40
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/infocenterdoor.cpp
View File

@ -13,7 +13,7 @@ InfocenterDoor::~InfocenterDoor()
}
// STUB: LEGO1 0x100379e0
MxLong InfocenterDoor::Notify(MxParam& p)
MxLong InfocenterDoor::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/infocenterdoor.h
View File

@ -10,7 +10,7 @@ class InfocenterDoor : public LegoWorld {
InfocenterDoor();
virtual ~InfocenterDoor(); // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x100377b0
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/legoanimationmanager.cpp
View File

@ -34,7 +34,7 @@ void LegoAnimationManager::FUN_1005f6d0(MxBool p)
}
// STUB: LEGO1 0x100619f0
MxLong LegoAnimationManager::Notify(MxParam& p)
MxLong LegoAnimationManager::Notify(MxParam& p_param)
{
// TODO

4
LEGO1/legoanimationmanager.h
View File

@ -10,8 +10,8 @@ class LegoAnimationManager : public MxCore {
LegoAnimationManager();
virtual ~LegoAnimationManager() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
// FUNCTION: LEGO1 0x1005ec80
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/legocarbuild.cpp
View File

@ -21,7 +21,7 @@ MxResult LegoCarBuild::Tickle()
}
// STUB: LEGO1 0x10024050
MxLong LegoCarBuild::Notify(MxParam& p)
MxLong LegoCarBuild::Notify(MxParam& p_param)
{
// TODO

4
LEGO1/legocarbuild.h
View File

@ -10,8 +10,8 @@ class LegoCarBuild : public LegoWorld {
LegoCarBuild();
virtual ~LegoCarBuild() override;
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
virtual MxResult Tickle() override; // vtable+0x8
// FUNCTION: LEGO1 0x10022940
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/legoentity.cpp
View File

@ -145,7 +145,7 @@ void LegoEntity::VTable0x4c()
}
// STUB: LEGO1 0x100114f0
MxLong LegoEntity::Notify(MxParam& p)
MxLong LegoEntity::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/legoentity.h
View File

@ -17,7 +17,7 @@ class LegoEntity : public MxEntity {
__declspec(dllexport) virtual ~LegoEntity() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x1000c2f0
inline const char* ClassName() const override // vtable+0xc

2
LEGO1/legoomni.cpp
View File

@ -546,7 +546,7 @@ MxResult LegoOmni::Start(MxDSAction* action)
}
// STUB: LEGO1 0x1005b5f0
MxLong LegoOmni::Notify(MxParam& p)
MxLong LegoOmni::Notify(MxParam& p_param)
{
// TODO
return 0;

2
LEGO1/legoomni.h
View File

@ -69,7 +69,7 @@ class LegoOmni : public MxOmni {
LegoOmni();
virtual ~LegoOmni(); // vtable+00
virtual MxLong Notify(MxParam& p) override; // vtable+04
virtual MxLong Notify(MxParam& p_param) override; // vtable+04
// FUNCTION: LEGO1 0x10058aa0
inline virtual const char* ClassName() const override // vtable+0c

2
LEGO1/legorace.cpp
View File

@ -75,7 +75,7 @@ LegoRace::~LegoRace()
}
// STUB: LEGO1 0x10015e00
MxLong LegoRace::Notify(MxParam& p)
MxLong LegoRace::Notify(MxParam& p_param)
{
// TODO
return 0;

2
LEGO1/legorace.h
View File

@ -12,7 +12,7 @@ class LegoRace : public LegoWorld {
LegoRace();
virtual ~LegoRace() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x10015ba0
inline const char* ClassName() const override // vtable+0xc

2
LEGO1/legoworld.h
View File

@ -14,7 +14,7 @@ class LegoWorld : public LegoEntity {
__declspec(dllexport) LegoWorld();
__declspec(dllexport) virtual ~LegoWorld(); // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x1001d690
inline virtual const char* ClassName() const override // vtable+0x0c

20
LEGO1/mxbackgroundaudiomanager.cpp
View File

@ -188,24 +188,24 @@ void MxBackgroundAudioManager::FadeInOrFadeOut()
}
// FUNCTION: LEGO1 0x1007f170
MxLong MxBackgroundAudioManager::Notify(MxParam& p)
MxLong MxBackgroundAudioManager::Notify(MxParam& p_param)
{
switch (((MxNotificationParam&) p).GetNotification()) {
switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationStartAction:
StartAction(p);
StartAction(p_param);
return 1;
case c_notificationEndAction:
StopAction(p);
StopAction(p_param);
return 1;
}
return 0;
}
// FUNCTION: LEGO1 0x1007f1b0
void MxBackgroundAudioManager::StartAction(MxParam& p)
void MxBackgroundAudioManager::StartAction(MxParam& p_param)
{
// TODO: the sender is most likely a MxAudioPresenter?
m_unk138 = (MxAudioPresenter*) ((MxNotificationParam&) p).GetSender();
m_unk138 = (MxAudioPresenter*) ((MxNotificationParam&) p_param).GetSender();
m_action2.SetAtomId(m_unk138->GetAction()->GetAtomId());
m_action2.SetObjectId(m_unk138->GetAction()->GetObjectId());
m_targetVolume = ((MxDSSound*) (m_unk138->GetAction()))->GetVolume();
@ -213,20 +213,20 @@ void MxBackgroundAudioManager::StartAction(MxParam& p)
}
// FUNCTION: LEGO1 0x1007f200
void MxBackgroundAudioManager::StopAction(MxParam& p)
void MxBackgroundAudioManager::StopAction(MxParam& p_param)
{
if (((MxNotificationParam&) p).GetSender() == m_unka0) {
if (((MxNotificationParam&) p_param).GetSender() == m_unka0) {
m_unka0 = NULL;
m_action1.SetAtomId(MxAtomId());
m_action1.SetObjectId(-1);
}
else if (((MxNotificationParam&) p).GetSender() == m_unk138) {
else if (((MxNotificationParam&) p_param).GetSender() == m_unk138) {
m_unk138 = NULL;
m_action2.SetAtomId(MxAtomId());
m_action2.SetObjectId(-1);
}
Lego()->HandleNotificationType2(p);
Lego()->HandleNotificationType2(p_param);
}
// FUNCTION: LEGO1 0x1007f2f0

8
LEGO1/mxbackgroundaudiomanager.h
View File

@ -15,8 +15,8 @@ class MxBackgroundAudioManager : public MxCore {
MxBackgroundAudioManager();
virtual ~MxBackgroundAudioManager() override;
virtual MxLong Notify(MxParam& p) override; // vtable+0x04
virtual MxResult Tickle() override; // vtable+0x08
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
virtual MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1007eb70
inline virtual const char* ClassName() const override // vtable+0x0c
@ -31,8 +31,8 @@ class MxBackgroundAudioManager : public MxCore {
return !strcmp(p_name, MxBackgroundAudioManager::ClassName()) || MxCore::IsA(p_name);
}
void StartAction(MxParam& p);
void StopAction(MxParam& p);
void StartAction(MxParam& p_param);
void StopAction(MxParam& p_param);
MxResult PlayMusic(MxDSAction& p_action, undefined4 p_unknown, undefined4 p_unknown2);
void FUN_1007ee70();

12
LEGO1/mxcompositepresenter.cpp
View File

@ -127,29 +127,29 @@ void MxCompositePresenter::EndAction()
}
// FUNCTION: LEGO1 0x100b6760
MxLong MxCompositePresenter::Notify(MxParam& p)
MxLong MxCompositePresenter::Notify(MxParam& p_param)
{
MxAutoLocker lock(&m_criticalSection);
switch (((MxNotificationParam&) p).GetNotification()) {
switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationEndAction:
VTable0x58(p);
VTable0x58(p_param);
break;
case MXPRESENTER_NOTIFICATION:
VTable0x5c(p);
VTable0x5c(p_param);
}
return 0;
}
// STUB: LEGO1 0x100b67f0
void MxCompositePresenter::VTable0x58(MxParam& p)
void MxCompositePresenter::VTable0x58(MxParam& p_param)
{
// TODO
}
// STUB: LEGO1 0x100b69b0
void MxCompositePresenter::VTable0x5c(MxParam& p)
void MxCompositePresenter::VTable0x5c(MxParam& p_param)
{
// TODO
}

6
LEGO1/mxcompositepresenter.h
View File

@ -13,7 +13,7 @@ class MxCompositePresenter : public MxPresenter {
MxCompositePresenter();
virtual ~MxCompositePresenter() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x04
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x04
inline virtual const char* ClassName() const override // vtable+0x0c
{
@ -31,8 +31,8 @@ class MxCompositePresenter : public MxPresenter {
virtual void SetTickleState(TickleState p_tickleState) override; // vtable+0x44
virtual MxBool HasTickleStatePassed(TickleState p_tickleState) override; // vtable+0x48
virtual void Enable(MxBool p_enable) override; // vtable+0x54
virtual void VTable0x58(MxParam& p); // vtable+0x58
virtual void VTable0x5c(MxParam& p); // vtable+0x5c
virtual void VTable0x58(MxParam& p_param); // vtable+0x58
virtual void VTable0x5c(MxParam& p_param); // vtable+0x5c
virtual void VTable0x60(MxPresenter* p_presenter); // vtable+0x60
virtual MxBool VTable0x64(undefined4 p_unknown); // vtable+0x64

2
LEGO1/mxcore.cpp
View File

@ -21,7 +21,7 @@ MxCore::~MxCore()
}
// FUNCTION: LEGO1 0x100ae1f0
MxLong MxCore::Notify(MxParam& p)
MxLong MxCore::Notify(MxParam& p_param)
{
return 0;
}

6
LEGO1/mxcore.h
View File

@ -20,9 +20,9 @@ class MxParam;
class MxCore {
public:
__declspec(dllexport) MxCore();
__declspec(dllexport) virtual ~MxCore(); // vtable+00
__declspec(dllexport) virtual MxLong Notify(MxParam& p); // vtable+04
virtual MxResult Tickle(); // vtable+08
__declspec(dllexport) virtual ~MxCore(); // vtable+00
__declspec(dllexport) virtual MxLong Notify(MxParam& p_param); // vtable+04
virtual MxResult Tickle(); // vtable+08
inline virtual const char* ClassName() const // vtable+0c
{

6
LEGO1/mxomni.cpp
View File

@ -339,14 +339,14 @@ void MxOmni::DestroyInstance()
}
// FUNCTION: LEGO1 0x100b07f0
MxLong MxOmni::Notify(MxParam& p)
MxLong MxOmni::Notify(MxParam& p_param)
{
MxAutoLocker lock(&this->m_criticalsection);
if (((MxNotificationParam&) p).GetNotification() != c_notificationEndAction)
if (((MxNotificationParam&) p_param).GetNotification() != c_notificationEndAction)
return 0;
return HandleNotificationType2(p);
return HandleNotificationType2(p_param);
}
// STUB: LEGO1 0x100b0880

2
LEGO1/mxomni.h
View File

@ -39,7 +39,7 @@ class MxOmni : public MxCore {
MxOmni();
virtual ~MxOmni() override;
virtual MxLong Notify(MxParam& p) override; // vtable+04
virtual MxLong Notify(MxParam& p_param) override; // vtable+04
virtual void Init(); // vtable+14
virtual MxResult Create(MxOmniCreateParam& p); // vtable+18
virtual void Destroy(); // vtable+1c

6
LEGO1/mxstreamer.cpp
View File

@ -154,14 +154,14 @@ MxBool MxStreamer::FUN_100b9b30(MxDSObject& p_dsObject)
}
// FUNCTION: LEGO1 0x100b9b60
MxLong MxStreamer::Notify(MxParam& p)
MxLong MxStreamer::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p).GetNotification() == MXSTREAMER_DELETE_NOTIFY) {
if (((MxNotificationParam&) p_param).GetNotification() == MXSTREAMER_DELETE_NOTIFY) {
MxDSAction ds;
ds.SetUnknown24(-2);
MxStreamController* c = static_cast<MxStreamerNotification&>(p).GetController();
MxStreamController* c = static_cast<MxStreamerNotification&>(p_param).GetController();
if (!c->FUN_100c20d0(ds)) {
MxStreamerNotification notif(MXSTREAMER_DELETE_NOTIFY, NULL, c);

2
LEGO1/mxstreamer.h
View File

@ -73,7 +73,7 @@ class MxStreamer : public MxCore {
__declspec(dllexport) MxStreamController* Open(const char* p_name, MxU16 p_openMode);
__declspec(dllexport) MxLong Close(const char* p_name);
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x100b9000
inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/police.cpp
View File

@ -13,7 +13,7 @@ Police::~Police()
}
// STUB: LEGO1 0x1005e480
MxLong Police::Notify(MxParam& p)
MxLong Police::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/police.h
View File

@ -11,7 +11,7 @@ class Police : public LegoWorld {
Police();
virtual ~Police() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x1005e1e0
inline virtual const char* ClassName() const override // vtable+0xc

2
LEGO1/registrationbook.cpp
View File

@ -13,7 +13,7 @@ RegistrationBook::~RegistrationBook()
}
// STUB: LEGO1 0x100770e0
MxLong RegistrationBook::Notify(MxParam& p)
MxLong RegistrationBook::Notify(MxParam& p_param)
{
// TODO

2
LEGO1/registrationbook.h
View File

@ -10,7 +10,7 @@ class RegistrationBook : public LegoWorld {
RegistrationBook();
virtual ~RegistrationBook() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x10076e10
inline virtual const char* ClassName() const override // vtable+0x0c

12
LEGO1/score.cpp
View File

@ -72,26 +72,26 @@ void Score::DeleteScript()
}
// FUNCTION: LEGO1 0x10001410
MxLong Score::Notify(MxParam& p)
MxLong Score::Notify(MxParam& p_param)
{
MxLong ret = 0;
LegoWorld::Notify(p);
LegoWorld::Notify(p_param);
if (m_unkf6) {
switch (((MxNotificationParam&) p).GetNotification()) {
switch (((MxNotificationParam&) p_param).GetNotification()) {
case c_notificationStartAction:
ret = 1;
Paint();
break;
case c_notificationEndAction:
ret = FUN_10001510((MxEndActionNotificationParam&) p);
ret = FUN_10001510((MxEndActionNotificationParam&) p_param);
break;
case c_notificationKeyPress:
if (((LegoEventNotificationParam&) p).GetKey() == 0x20)
if (((LegoEventNotificationParam&) p_param).GetKey() == 0x20)
DeleteScript(); // Shutting down
ret = 1;
break;
case TYPE17:
ret = FUN_100016d0((MxType17NotificationParam&) p);
ret = FUN_100016d0((MxType17NotificationParam&) p_param);
break;
case MXTRANSITIONMANAGER_TRANSITIONENDED:
DeleteObjects(g_infoscorScript, 7, 9);

4
LEGO1/score.h
View File

@ -12,8 +12,8 @@
class Score : public LegoWorld {
public:
Score();
virtual ~Score() override; // vtable+0x0
virtual MxLong Notify(MxParam& p) override; // vtable+0x4
virtual ~Score() override; // vtable+0x0
virtual MxLong Notify(MxParam& p_param) override; // vtable+0x4
// FUNCTION: LEGO1 0x100010c0
inline virtual const char* ClassName() const override // vtable+0x0c