Fix MxParam casts in Notify functions (#1188)

* 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

View File

@@ -12,6 +12,7 @@
#include "mxtimer.h"
#include "roi/legoroi.h"
#include <assert.h>
#include <stdio.h>
#include <vec.h>
@@ -148,7 +149,9 @@ MxResult Act2Brick::Tickle()
// FUNCTION: BETA10 0x10012ec4
MxLong Act2Brick::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick && m_roi->GetVisibility()) {
MxNotificationParam& param = (MxNotificationParam&) p_param;
if (param.GetNotification() == c_notificationClick && m_roi->GetVisibility()) {
m_roi->SetVisibility(FALSE);
if (m_whistleSound != NULL) {
@@ -160,6 +163,7 @@ MxLong Act2Brick::Notify(MxParam& p_param)
return 1;
}
assert(0);
return 0;
}

View File

@@ -9,9 +9,12 @@
DECOMP_SIZE_ASSERT(Act2PoliceStation, 0x68)
// FUNCTION: LEGO1 0x1004e0e0
// FUNCTION: BETA10 0x100137c0
MxLong Act2PoliceStation::Notify(MxParam& p_param)
{
if (((MxNotificationParam&) p_param).GetNotification() == c_notificationClick) {
MxNotificationParam& param = (MxNotificationParam&) p_param;
if (param.GetNotification() == c_notificationClick) {
MxNotificationParam param(c_notificationType23, NULL);
NotificationManager()->Send(CurrentWorld(), param);
return 1;

View File

@@ -38,6 +38,7 @@ MxResult LegoCameraController::Create()
}
// FUNCTION: LEGO1 0x10012020
// FUNCTION: BETA10 0x10067852
MxLong LegoCameraController::Notify(MxParam& p_param)
{
switch (((MxNotificationParam&) p_param).GetNotification()) {