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

Fixes/changes

Browse Source
This commit is contained in:
Christian Semmler 2024-01-29 17:40:36 -05:00
parent 03f14debd3
commit 62023d203b
6 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/lego/legoomni/include/mxcontrolpresenter.h
View File

@ -5,6 +5,7 @@
#include "mxcompositepresenter.h" #include "mxcompositepresenter.h"
class LegoControlManagerEvent; class LegoControlManagerEvent;
class MxVideoPresenter;
// VTABLE: LEGO1 0x100d7b88 // VTABLE: LEGO1 0x100d7b88
// SIZE 0x5c // SIZE 0x5c
@ -41,7 +42,7 @@ class MxControlPresenter : public MxCompositePresenter {
MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter); MxBool FUN_10044480(LegoControlManagerEvent* p_event, MxPresenter* p_presenter);
private: private:
MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter); MxBool FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter);
void FUN_10044540(undefined2); void FUN_10044540(undefined2);
undefined2 m_unk0x4c; // 0x4c undefined2 m_unk0x4c; // 0x4c

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

@ -2,7 +2,7 @@
#include "define.h" #include "define.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "mxdsparallelaction.h" #include "mxdsmultiaction.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxutil.h" #include "mxutil.h"
@ -103,28 +103,33 @@ void MxControlPresenter::EndAction()
} }
// FUNCTION: LEGO1 0x10044270 // FUNCTION: LEGO1 0x10044270
MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_presenter) MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxVideoPresenter* p_presenter)
{ {
if (m_unk0x4c == 3) { if (m_unk0x4c == 3) {
MxPresenter* first = *m_list.begin(); MxVideoPresenter* frontPresenter = (MxVideoPresenter*) m_list.front();
if (p_presenter == first || first->GetDisplayZ() < first->GetDisplayZ()) {
MxS32 height = ((MxVideoPresenter*) first)->GetHeight();
MxS32 width = ((MxVideoPresenter*) first)->GetWidth();
if (first->GetLocation().GetX() <= p_x && p_x < width - 1 + first->GetLocation().GetY() && if (p_presenter == frontPresenter || frontPresenter->GetDisplayZ() < frontPresenter->GetDisplayZ()) {
first->GetLocation().GetY() <= p_y && p_y < height - 1 + first->GetLocation().GetY()) { 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() &&
frontPresenter->GetLocation().GetY() <= p_y &&
p_y < height - 1 + frontPresenter->GetLocation().GetY()) {
MxU8* start; MxU8* start;
MxBitmap* bitmap = ((MxVideoPresenter*) first)->GetBitmap();
if (((MxVideoPresenter*) first)->GetAlphaMask() == NULL) { if (frontPresenter->GetAlphaMask() == NULL) {
start = bitmap->GetStart(p_x - first->GetLocation().GetX(), p_y - first->GetLocation().GetY()); start = frontPresenter->GetBitmap()->GetStart(
p_x - frontPresenter->GetLocation().GetX(),
p_y - frontPresenter->GetLocation().GetY()
);
} }
else { else {
start = NULL; start = NULL;
} }
m_unk0x56 = 0;
m_unk0x56 = 0;
if (m_unk0x58 == NULL) { if (m_unk0x58 == NULL) {
if (*start != 0) { if (*start != 0) {
m_unk0x56 = 1; m_unk0x56 = 1;
@ -145,11 +150,12 @@ MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_pre
} }
} }
} }
}
else { else {
if (HasCompositePresenter(&m_list, p_presenter)) { if (ContainsPresenter(m_list, p_presenter)) {
if (m_unk0x4c == 2) { if (m_unk0x4c == 2) {
MxS32 width = ((MxVideoPresenter*) p_presenter)->GetWidth(); MxS32 width = p_presenter->GetWidth();
MxS32 height = ((MxVideoPresenter*) p_presenter)->GetHeight(); MxS32 height = p_presenter->GetHeight();
if (m_unk0x52 == 2 && m_unk0x54 == 2) { if (m_unk0x52 == 2 && m_unk0x54 == 2) {
MxS16 val; MxS16 val;
@ -178,6 +184,7 @@ MxBool MxControlPresenter::FUN_10044270(MxS32 p_x, MxS32 p_y, MxPresenter* p_pre
return TRUE; return TRUE;
} }
} }
return FALSE; return FALSE;
} }
@ -197,7 +204,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
} }
break; break;
case c_notificationButtonDown: case c_notificationButtonDown:
if (FUN_10044270(p_event->GetX(), p_event->GetY(), p_presenter)) { if (FUN_10044270(p_event->GetX(), p_event->GetY(), (MxVideoPresenter*) p_presenter)) {
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);
@ -216,7 +223,7 @@ MxBool MxControlPresenter::FUN_10044480(LegoControlManagerEvent* p_event, MxPres
void MxControlPresenter::VTable0x6c(MxS16 p_val) void MxControlPresenter::VTable0x6c(MxS16 p_val)
{ {
if (p_val == -1) { if (p_val == -1) {
if ((MxS16) ((MxDSParallelAction*) m_action)->GetActionList()->GetCount() - m_unk0x4e == 1) { if ((MxS16) ((MxDSMultiAction*) m_action)->GetActionList()->GetCount() - m_unk0x4e == 1) {
m_unk0x4e = 0; m_unk0x4e = 0;
} }
else { else {

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

@ -46,7 +46,7 @@ class MxCompositePresenter : public MxPresenter {
return TRUE; return TRUE;
}; // vtable+0x64 }; // vtable+0x64
inline MxCompositePresenterList* GetList() { return &m_list; } inline MxCompositePresenterList& GetList() { return m_list; }
protected: protected:
MxCompositePresenterList m_list; // 0x40 MxCompositePresenterList m_list; // 0x40

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

@ -73,7 +73,7 @@ MxBool GetRectIntersection(
void MakeSourceName(char*, const char*); void MakeSourceName(char*, const char*);
void SetOmniUserMessage(void (*)(const char*, int)); void SetOmniUserMessage(void (*)(const char*, int));
MxBool HasCompositePresenter(MxCompositePresenterList* p_presenterList, MxPresenter* p_presenter); MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter);
void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags); void FUN_100b7220(MxDSAction* p_action, MxU32 p_newFlags, MxBool p_setFlags);
MxDSObject* CreateStreamObject(MxDSFile*, MxS16); MxDSObject* CreateStreamObject(MxDSFile*, MxS16);

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

@ -72,7 +72,7 @@ class MxVideoPresenter : public MxMediaPresenter {
virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78 virtual LPDIRECTDRAWSURFACE VTable0x78() { return m_unk0x58; }; // vtable+0x78
// FUNCTION: LEGO1 0x1000c7c0 // FUNCTION: LEGO1 0x1000c7c0
virtual MxBool VTable0x7c() { return (m_bitmap != NULL) || (m_alpha != NULL); }; // vtable+0x7c virtual MxBool VTable0x7c() { return m_bitmap != NULL || m_alpha != NULL; }; // vtable+0x7c
// FUNCTION: LEGO1 0x1000c7e0 // FUNCTION: LEGO1 0x1000c7e0
virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); }; // vtable+0x80 virtual MxS32 GetWidth() { return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiWidth(); }; // vtable+0x80

6
LEGO1/omni/src/common/mxutil.cpp
View File

@ -112,11 +112,11 @@ MxBool KeyValueStringParse(char* p_outputValue, const char* p_key, const char* p
} }
// FUNCTION: LEGO1 0x100b7170 // FUNCTION: LEGO1 0x100b7170
MxBool HasCompositePresenter(MxCompositePresenterList* p_presenterList, MxPresenter* p_presenter) MxBool ContainsPresenter(MxCompositePresenterList& p_presenterList, MxPresenter* p_presenter)
{ {
for (MxCompositePresenterList::iterator it = p_presenterList->begin(); it != p_presenterList->end(); it++) { for (MxCompositePresenterList::iterator it = p_presenterList.begin(); it != p_presenterList.end(); it++) {
if (p_presenter == *it || (*it)->IsA("MxCompositePresenter") && if (p_presenter == *it || (*it)->IsA("MxCompositePresenter") &&
HasCompositePresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter)) { ContainsPresenter(((MxCompositePresenter*) *it)->GetList(), p_presenter)) {
return TRUE; return TRUE;
} }
} }