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

Rename stuff for consistency

Browse Source
This commit is contained in:
Christian Semmler 2024-01-31 07:45:47 -05:00
parent e0d5b771de
commit 5a9bea65fd
12 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/include/elevatorbottom.h
View File

@ -43,7 +43,7 @@ class ElevatorBottom : public LegoWorld {
private: private:
undefined4 m_unk0xf8; // 0xf8 undefined4 m_unk0xf8; // 0xf8
MxLong HandleNotification17(LegoControlManagerEvent& p_param); MxLong HandleClick(LegoControlManagerEvent& p_param);
}; };
#endif // ELEVATORBOTTOM_H #endif // ELEVATORBOTTOM_H

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

@ -183,7 +183,7 @@ class Infocenter : public LegoWorld {
MxLong HandleKeyPress(MxS8 p_key); MxLong HandleKeyPress(MxS8 p_key);
MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y); MxU8 HandleMouseMove(MxS32 p_x, MxS32 p_y);
MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y); MxU8 HandleButtonUp(MxS32 p_x, MxS32 p_y);
MxU8 HandleNotification17(LegoControlManagerEvent& p_param); MxU8 HandleClick(LegoControlManagerEvent& p_param);
MxLong HandleEndAction(MxParam& p_param); MxLong HandleEndAction(MxParam& p_param);
MxLong HandleNotification0(MxParam&); MxLong HandleNotification0(MxParam&);

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

@ -43,7 +43,7 @@ class Radio : public MxCore {
MxBool m_bgAudioPreviouslyEnabled; // 0x0d MxBool m_bgAudioPreviouslyEnabled; // 0x0d
MxLong HandleEndAction(MxEndActionNotificationParam& p_param); MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleNotification17(LegoControlManagerEvent& p_param); MxLong HandleClick(LegoControlManagerEvent& p_param);
}; };
#endif // RADIO_H #endif // RADIO_H

10
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -428,18 +428,18 @@ void LegoGameState::SwitchArea(MxU32 p_area)
BackgroundAudioManager()->Stop(); BackgroundAudioManager()->Stop();
AnimationManager()->FUN_1005ef10(); AnimationManager()->FUN_1005ef10();
VideoManager()->SetUnk0x554(0); VideoManager()->SetUnk0x554(FALSE);
MxAtomId* script = g_isleScript; MxAtomId* script = g_isleScript;
switch (p_area) { switch (p_area) {
case 1: case 1:
break; break;
case 2: case 2:
VideoManager()->SetUnk0x554(1); VideoManager()->SetUnk0x554(TRUE);
script = g_infomainScript; script = g_infomainScript;
break; break;
case 3: case 3:
VideoManager()->SetUnk0x554(1); VideoManager()->SetUnk0x554(TRUE);
script = g_infodoorScript; script = g_infodoorScript;
break; break;
// TODO // TODO
@ -447,11 +447,11 @@ void LegoGameState::SwitchArea(MxU32 p_area)
script = g_elevbottScript; script = g_elevbottScript;
break; break;
case 12: case 12:
VideoManager()->SetUnk0x554(1); VideoManager()->SetUnk0x554(TRUE);
script = g_regbookScript; script = g_regbookScript;
break; break;
case 13: case 13:
VideoManager()->SetUnk0x554(1); VideoManager()->SetUnk0x554(TRUE);
script = g_infoscorScript; script = g_infoscorScript;
break; break;

4
LEGO1/lego/legoomni/src/control/mxcontrolpresenter.cpp
View File

@ -198,7 +198,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
p_event->SetClickedObjectId(m_action->GetObjectId()); p_event->SetClickedObjectId(m_action->GetObjectId());
p_event->SetClickedAtom(m_action->GetAtomId().GetInternal()); p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
VTable0x6c(0); VTable0x6c(0);
p_event->SetType(c_notificationType17); p_event->SetType(c_notificationClick);
p_event->SetUnknown0x28(m_unk0x4e); p_event->SetUnknown0x28(m_unk0x4e);
return TRUE; return TRUE;
} }
@ -208,7 +208,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
p_event->SetClickedObjectId(m_action->GetObjectId()); p_event->SetClickedObjectId(m_action->GetObjectId());
p_event->SetClickedAtom(m_action->GetAtomId().GetInternal()); p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
VTable0x6c(m_unk0x56); VTable0x6c(m_unk0x56);
p_event->SetType(c_notificationType17); p_event->SetType(c_notificationClick);
p_event->SetUnknown0x28(m_unk0x4e); p_event->SetUnknown0x28(m_unk0x4e);
return TRUE; return TRUE;
} }

6
LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
View File

@ -58,8 +58,8 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
if (m_worldStarted) { if (m_worldStarted) {
switch (((MxNotificationParam&) p_param).GetType()) { switch (((MxNotificationParam&) p_param).GetType()) {
case c_notificationType17: case c_notificationClick:
ret = HandleNotification17((LegoControlManagerEvent&) p_param); ret = HandleClick((LegoControlManagerEvent&) p_param);
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:
GameState()->SwitchArea(m_unk0xf8); GameState()->SwitchArea(m_unk0xf8);
@ -79,7 +79,7 @@ void ElevatorBottom::ReadyWorld()
} }
// FUNCTION: LEGO1 0x100181d0 // FUNCTION: LEGO1 0x100181d0
MxLong ElevatorBottom::HandleNotification17(LegoControlManagerEvent& p_param) MxLong ElevatorBottom::HandleClick(LegoControlManagerEvent& p_param)
{ {
MxLong result = 0; MxLong result = 0;
if (p_param.GetUnknown0x28() == 1) { if (p_param.GetUnknown0x28() == 1) {

6
LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
View File

@ -126,8 +126,8 @@ MxLong Infocenter::Notify(MxParam& p_param)
((LegoEventNotificationParam&) p_param).GetY() ((LegoEventNotificationParam&) p_param).GetY()
); );
break; break;
case c_notificationType17: case c_notificationClick:
result = HandleNotification17((LegoControlManagerEvent&) p_param); result = HandleClick((LegoControlManagerEvent&) p_param);
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:
StopBookAnimation(); StopBookAnimation();
@ -514,7 +514,7 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
} }
// FUNCTION: LEGO1 0x10070370 // FUNCTION: LEGO1 0x10070370
MxU8 Infocenter::HandleNotification17(LegoControlManagerEvent& p_param) MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
{ {
if (p_param.GetUnknown0x28() == 1) { if (p_param.GetUnknown0x28() == 1) {
m_infoManDialogueTimer = 0; m_infoManDialogueTimer = 0;

4
LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
View File

@ -63,11 +63,11 @@ MxLong InfocenterDoor::Notify(MxParam& p_param)
result = 1; result = 1;
} }
break; break;
case c_notificationType17: case c_notificationClick:
result = HandleClick((LegoControlManagerEvent&) p_param); result = HandleClick((LegoControlManagerEvent&) p_param);
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:
GameState()->HandleAction(m_unk0xf8); GameState()->SwitchArea(m_unk0xf8);
result = 1; result = 1;
break; break;
} }

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

@ -91,7 +91,7 @@ MxLong Score::Notify(MxParam& p_param)
DeleteScript(); // Shutting down DeleteScript(); // Shutting down
ret = 1; ret = 1;
break; break;
case c_notificationType17: case c_notificationClick:
ret = FUN_100016d0((LegoControlManagerEvent&) p_param); ret = FUN_100016d0((LegoControlManagerEvent&) p_param);
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:

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

@ -115,7 +115,7 @@ MxLong Isle::Notify(MxParam& p_param)
break; break;
} }
break; break;
case c_notificationType17: case c_notificationClick:
result = HandleType17Notification(p_param); result = HandleType17Notification(p_param);
break; break;
case c_notificationType18: case c_notificationType18:

6
LEGO1/lego/legoomni/src/isle/radio.cpp
View File

@ -41,8 +41,8 @@ MxLong Radio::Notify(MxParam& p_param)
case c_notificationEndAction: case c_notificationEndAction:
result = HandleEndAction((MxEndActionNotificationParam&) p_param); result = HandleEndAction((MxEndActionNotificationParam&) p_param);
break; break;
case c_notificationType17: case c_notificationClick:
result = HandleNotification17((LegoControlManagerEvent&) p_param); result = HandleClick((LegoControlManagerEvent&) p_param);
break; break;
} }
} }
@ -89,7 +89,7 @@ void Radio::Stop()
} }
// FUNCTION: LEGO1 0x1002cbc0 // FUNCTION: LEGO1 0x1002cbc0
MxLong Radio::HandleNotification17(LegoControlManagerEvent& p_param) MxLong Radio::HandleClick(LegoControlManagerEvent& p_param)
{ {
MxDSAction action; // Unused MxDSAction action; // Unused
MxS32 objectId = p_param.GetClickedObjectId(); MxS32 objectId = p_param.GetClickedObjectId();

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

@ -23,7 +23,7 @@ enum NotificationId {
c_notificationDragStart = 13, c_notificationDragStart = 13,
c_notificationDrag = 14, c_notificationDrag = 14,
c_notificationTimer = 15, // 100d6aa0 c_notificationTimer = 15, // 100d6aa0
c_notificationType17 = 17, c_notificationClick = 17,
c_notificationType18 = 18, // 100d7e80 c_notificationType18 = 18, // 100d7e80
c_notificationType19 = 19, // 100d6230 c_notificationType19 = 19, // 100d6230
c_notificationType20 = 20, c_notificationType20 = 20,