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

Match MxVideoPresenter::Destroy to ~88%

Browse Source
This commit is contained in:
Christian Semmler 2023-10-16 16:02:00 -04:00
parent b367167d7c
commit 50f14cb150
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
LEGO1/mxvideopresenter.cpp
View File

@ -2,6 +2,7 @@
#include "MxVideoManager.h" #include "MxVideoManager.h"
DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64); DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
DECOMP_SIZE_ASSERT(MxVideoPresenter::UnkStruct, 0xc);
// OFFSET: LEGO1 0x1000c700 // OFFSET: LEGO1 0x1000c700
void MxVideoPresenter::VTable0x5c(undefined4 p_unknown1) void MxVideoPresenter::VTable0x5c(undefined4 p_unknown1)
@ -40,7 +41,7 @@ void MxVideoPresenter::Destroy()
} }
// OFFSET: LEGO1 0x1000c7b0 // OFFSET: LEGO1 0x1000c7b0
MxCore* MxVideoPresenter::VTable0x78() LPDIRECTDRAWSURFACE MxVideoPresenter::VTable0x78()
{ {
return m_unk58; return m_unk58;
} }
@ -74,12 +75,13 @@ void MxVideoPresenter::Init()
m_unk58 = NULL; m_unk58 = NULL;
m_unk60 = -1; m_unk60 = -1;
m_flags = m_flags & 0xfe; m_flags = m_flags & 0xfe;
if (MVideoManager() != NULL)
{ if (MVideoManager() != NULL) {
MVideoManager(); MVideoManager();
m_flags = m_flags | 2; m_flags = m_flags | 2;
m_flags = m_flags & 0xfb; m_flags = m_flags & 0xfb;
} }
m_flags = m_flags & 0xf7; m_flags = m_flags & 0xf7;
m_flags = m_flags & 0xef; m_flags = m_flags & 0xef;
} }
@ -87,39 +89,35 @@ void MxVideoPresenter::Init()
// OFFSET: LEGO1 0x100b27b0 // OFFSET: LEGO1 0x100b27b0
void MxVideoPresenter::Destroy(MxBool p_fromDestructor) void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
{ {
MxRect32 rect;
if (MVideoManager() != NULL) if (MVideoManager() != NULL)
{
MVideoManager()->RemovePresenter(*this); MVideoManager()->RemovePresenter(*this);
}
if(m_unk58 != NULL) if (m_unk58) {
{ m_unk58->Release();
m_unk58->Tickle();
m_unk58 = NULL; m_unk58 = NULL;
m_flags = m_flags & 0xfd; m_flags = m_flags & 0xfd;
m_flags = m_flags & 0xfb; m_flags = m_flags & 0xfb;
} }
if (MVideoManager() != NULL && m_unk54 != NULL && m_bitmap != NULL) if (MVideoManager() && (m_unk54 || m_bitmap)) {
{ MxS32 height = GetHeight();
rect.m_right = GetWidth() + rect.m_left; MxS32 width = GetWidth();
rect.m_bottom = GetHeight() + rect.m_top;
rect.m_left = GetLocationX(); MxS32 x = GetLocationX();
rect.m_top = GetLocationY(); MxS32 y = GetLocationY();
MxRect32 rect(x, y, x + width, y + height);
MVideoManager()->InvalidateRect(rect); MVideoManager()->InvalidateRect(rect);
MVideoManager()->vtable0x34(rect.m_left, rect.m_top, rect.GetWidth(), rect.GetHeight()); MVideoManager()->vtable0x34(rect.m_left, rect.m_top, rect.GetWidth(), rect.GetHeight());
} }
delete m_bitmap; delete m_bitmap;
delete m_unk58; delete m_unk54;
Init(); Init();
if (!p_fromDestructor) if (!p_fromDestructor)
{ MxMediaPresenter::Destroy(FALSE);
// TODO MxMediaPresenter->Destroy(FALSE)
}
} }
// OFFSET: LEGO1 0x100b28b0 STUB // OFFSET: LEGO1 0x100b28b0 STUB

14
LEGO1/mxvideopresenter.h
View File

@ -42,22 +42,24 @@ class MxVideoPresenter : public MxMediaPresenter
virtual void VTable0x6c(); // vtable+0x6c virtual void VTable0x6c(); // vtable+0x6c
virtual void VTable0x70(); // vtable+0x70 virtual void VTable0x70(); // vtable+0x70
virtual undefined VTable0x74(); // vtable+0x74 virtual undefined VTable0x74(); // vtable+0x74
virtual MxCore* VTable0x78(); // vtable+0x78 virtual LPDIRECTDRAWSURFACE VTable0x78(); // vtable+0x78
virtual MxBool VTable0x7c(); // vtable+0x7c virtual MxBool VTable0x7c(); // vtable+0x7c
virtual MxS32 GetWidth(); // vtable+0x80 virtual MxS32 GetWidth(); // vtable+0x80
virtual MxS32 GetHeight(); // vtable+0x84 virtual MxS32 GetHeight(); // vtable+0x84
// TODO: Not sure what this is. Seems to have size of 12 bytes // TODO: Not sure what this is. Seems to have size of 12 bytes
// based on 0x100b9e9a. Values are copied from the bitmap header. // based on 0x100b9e9a. Values are copied from the bitmap header.
typedef struct { struct UnkStruct {
undefined unk0[8]; undefined unk0[4];
MxU16 width; MxU16 width;
MxU16 height; MxU16 height;
} unknown_meta_struct;
virtual ~UnkStruct() {}
};
MxBitmap *m_bitmap; MxBitmap *m_bitmap;
unknown_meta_struct *m_unk54; UnkStruct *m_unk54;
MxCore* m_unk58; LPDIRECTDRAWSURFACE m_unk58;
undefined2 m_unk5c; undefined2 m_unk5c;
unsigned char m_flags; // 0x5e unsigned char m_flags; // 0x5e
MxLong m_unk60; MxLong m_unk60;