mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-25 09:24:17 +00:00
Implement various infocenter functions (#510)
* Implement various infocenter methods * fix order * Update infocenter.cpp * Update infocenter.cpp * Update infocenter.cpp * Update mxcontrolpresenter.cpp * Rename stuff for consistency * Add StateStruct to InfocenterState * Resolve some TODO * Use MxRect32 * Improve match * Match Infocenter::UpdateFrameHot * Fix VTable0x64 * WIP Match * Match * Cleanup --------- Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
@@ -108,13 +108,13 @@ MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter*
|
||||
if (m_unk0x4c == 3) {
|
||||
MxVideoPresenter* frontPresenter = (MxVideoPresenter*) m_list.front();
|
||||
|
||||
if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < frontPresenter->GetDisplayZ()) {
|
||||
if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < p_presenter->GetDisplayZ()) {
|
||||
if (p_presenter->VTable0x7c()) {
|
||||
MxS32 height = frontPresenter->GetHeight();
|
||||
MxS32 width = frontPresenter->GetWidth();
|
||||
|
||||
if (frontPresenter->GetLocation().GetX() <= p_x &&
|
||||
p_x < width - 1 + frontPresenter->GetLocation().GetY() &&
|
||||
p_x < width - 1 + frontPresenter->GetLocation().GetX() &&
|
||||
frontPresenter->GetLocation().GetY() <= p_y &&
|
||||
p_y < height - 1 + frontPresenter->GetLocation().GetY()) {
|
||||
MxU8* start;
|
||||
@@ -198,7 +198,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
|
||||
p_event->SetClickedObjectId(m_action->GetObjectId());
|
||||
p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
|
||||
VTable0x6c(0);
|
||||
p_event->SetType(c_notificationType17);
|
||||
p_event->SetType(c_notificationClick);
|
||||
p_event->SetUnknown0x28(m_unk0x4e);
|
||||
return TRUE;
|
||||
}
|
||||
@@ -208,7 +208,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
|
||||
p_event->SetClickedObjectId(m_action->GetObjectId());
|
||||
p_event->SetClickedAtom(m_action->GetAtomId().GetInternal());
|
||||
VTable0x6c(m_unk0x56);
|
||||
p_event->SetType(c_notificationType17);
|
||||
p_event->SetType(c_notificationClick);
|
||||
p_event->SetUnknown0x28(m_unk0x4e);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user