diff --git a/LEGO1/mxflcpresenter.cpp b/LEGO1/mxflcpresenter.cpp index 991e0bbe..6325c3b9 100644 --- a/LEGO1/mxflcpresenter.cpp +++ b/LEGO1/mxflcpresenter.cpp @@ -23,6 +23,7 @@ MxFlcPresenter::~MxFlcPresenter() delete this->m_unk64; } } +<<<<<<< HEAD // OFFSET: LEGO1 0x100b3620 void MxFlcPresenter::VTable0x70() @@ -33,3 +34,16 @@ void MxFlcPresenter::VTable0x70() if (pal) delete pal; } +||||||| parent of 679bbcf (MxFlcPresenter: vtable70) +======= + +// OFFSET: LEGO1 0x100b3620 +void MxFlcPresenter::vtable70() +{ + MxPalette* pal = m_bitmap->CreatePalette(); + MVideoManager()->RealizePalette(pal); + if (pal) { + delete pal; + } +} +>>>>>>> 679bbcf (MxFlcPresenter: vtable70) diff --git a/LEGO1/mxflcpresenter.h b/LEGO1/mxflcpresenter.h index 7cf6aa9d..b0c0fb33 100644 --- a/LEGO1/mxflcpresenter.h +++ b/LEGO1/mxflcpresenter.h @@ -26,6 +26,8 @@ class MxFlcPresenter : public MxVideoPresenter { virtual void VTable0x70() override; // vtable+0x70 + virtual void vtable70() override; // vtable+0x74 + undefined4* m_unk64; };