mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-27 10:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MxParam casts in Notify functions (#1188)

Browse Source 
* First batch

* Second batch
This commit is contained in:
MS
2024-12-03 17:51:03 -05:00
committed by GitHub
parent 5693b1a266
commit 7ece9cf37b
28 changed files with 92 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/lego/legoomni/src/actors/ambulance.cpp
View File

@@ -130,8 +130,9 @@ void Ambulance::CreateState()
MxLong Ambulance::Notify(MxParam& p_param)
{
MxLong result = 0;
MxNotificationParam& param = (MxNotificationParam&) p_param;
switch (((MxNotificationParam&) p_param).GetNotification()) {
switch (param.GetNotification()) {
case c_notificationType0:
result = HandleNotification0();
break;

5
LEGO1/lego/legoomni/src/actors/buildingentity.cpp
View File

@@ -19,9 +19,12 @@ BuildingEntity::~BuildingEntity()
}
// FUNCTION: LEGO1 0x100150a0
// FUNCTION: BETA10 0x10024e37
MxLong BuildingEntity::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick) {
MxNotificationParam& param = (MxNotificationParam&) p_param;
if (param.GetNotification() == c_notificationClick) {
return HandleClick((LegoEventNotificationParam&) p_param);
}

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

@@ -33,10 +33,12 @@ BumpBouy::~BumpBouy()
MxLong BumpBouy::Notify(MxParam& p_param)
{
MxLong result = 0;
MxNotificationParam& param = (MxNotificationParam&) p_param;
IslePathActor* user = (IslePathActor*) UserActor();
assert(user);
if (user->IsA("Jetski") && ((MxNotificationParam&) p_param).GetNotification() == c_notificationClick) {
if (user->IsA("Jetski") && param.GetNotification() == c_notificationClick) {
VideoManager()->SetRender3D(FALSE);
user->SetWorldSpeed(0);
user->Exit();

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

@@ -25,11 +25,13 @@ MxResult IsleActor::Create(MxDSAction& p_dsAction)
}
// FUNCTION: LEGO1 0x1002c7b0
// FUNCTION: BETA10 0x1003622e
MxLong IsleActor::Notify(MxParam& p_param)
{
MxLong result = 0;
MxNotificationParam& param = (MxNotificationParam&) p_param;
switch (((MxNotificationParam&) p_param).GetNotification()) {
switch (param.GetNotification()) {
case c_notificationType0:
result = VTable0x6c();
break;

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

@@ -46,11 +46,13 @@ void IslePathActor::Destroy(MxBool p_fromDestructor)
}
// FUNCTION: LEGO1 0x1001a2c0
// FUNCTION: BETA10 0x100364ca
MxLong IslePathActor::Notify(MxParam& p_param)
{
MxLong result = 0;
MxNotificationParam& param = (MxNotificationParam&) p_param;
switch (((MxNotificationParam&) p_param).GetNotification()) {
switch (param.GetNotification()) {
case c_notificationType0:
result = HandleNotification0();
break;

5
LEGO1/lego/legoomni/src/actors/jukeboxentity.cpp
View File

@@ -30,9 +30,12 @@ JukeBoxEntity::~JukeBoxEntity()
}
// FUNCTION: LEGO1 0x10085e40
// FUNCTION: BETA10 0x10038c37
MxLong JukeBoxEntity::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick) {
MxNotificationParam& param = (MxNotificationParam&) p_param;
if (param.GetNotification() == c_notificationClick) {
if (!FUN_1003ef60()) {
return 1;
}

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

@@ -81,12 +81,14 @@ Radio::~Radio()
}
// FUNCTION: LEGO1 0x1002ca30
// FUNCTION: BETA10 0x100f19e8
MxLong Radio::Notify(MxParam& p_param)
{
MxLong result = 0;
if (m_unk0x0c) {
switch (((MxNotificationParam&) p_param).GetNotification()) {
MxNotificationParam& param = (MxNotificationParam&) p_param;
switch (param.GetNotification()) {
case c_notificationEndAction:
result = HandleEndAction((MxEndActionNotificationParam&) p_param);
break;

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

@@ -113,11 +113,13 @@ void TowTrack::CreateState()
}
// FUNCTION: LEGO1 0x1004cc80
// FUNCTION: BETA10 0x100f6de2
MxLong TowTrack::Notify(MxParam& p_param)
{
MxLong result = 0;
MxNotificationParam& param = (MxNotificationParam&) p_param;
switch (((MxNotificationParam&) p_param).GetNotification()) {
switch (param.GetNotification()) {
case c_notificationType0:
result = HandleNotification0();
break;