From 4b08cb4a7ed0a190afc76261a7391a8f3135e99b Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 29 Dec 2023 18:01:24 -0500 Subject: [PATCH] Rename functions for consistency --- LEGO1/mxdisplaysurface.cpp | 10 +++++----- LEGO1/mxdisplaysurface.h | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/LEGO1/mxdisplaysurface.cpp b/LEGO1/mxdisplaysurface.cpp index 59aadaff..0aec323e 100644 --- a/LEGO1/mxdisplaysurface.cpp +++ b/LEGO1/mxdisplaysurface.cpp @@ -10,17 +10,17 @@ MxU32 g_unk0x1010215c = 0; // FUNCTION: LEGO1 0x100ba500 MxDisplaySurface::MxDisplaySurface() { - this->Reset(); + this->Init(); } // FUNCTION: LEGO1 0x100ba5a0 MxDisplaySurface::~MxDisplaySurface() { - this->Clear(); + this->Destroy(); } // FUNCTION: LEGO1 0x100ba610 -void MxDisplaySurface::Reset() +void MxDisplaySurface::Init() { this->m_ddSurface1 = NULL; this->m_ddSurface2 = NULL; @@ -199,7 +199,7 @@ MxResult MxDisplaySurface::Create(MxVideoParam& p_videoParam) } // FUNCTION: LEGO1 0x100baa90 -void MxDisplaySurface::Clear() +void MxDisplaySurface::Destroy() { if (this->m_initialized) { if (this->m_ddSurface2) @@ -215,7 +215,7 @@ void MxDisplaySurface::Clear() if (this->m_16bitPal) delete this->m_16bitPal; - this->Reset(); + this->Init(); } // STUB: LEGO1 0x100baae0 diff --git a/LEGO1/mxdisplaysurface.h b/LEGO1/mxdisplaysurface.h index aed5b24a..39a2fda8 100644 --- a/LEGO1/mxdisplaysurface.h +++ b/LEGO1/mxdisplaysurface.h @@ -23,7 +23,7 @@ class MxDisplaySurface : public MxCore { LPDIRECTDRAWCLIPPER p_ddClipper ); // vtable+0x14 virtual MxResult Create(MxVideoParam& p_videoParam); // vtable+0x18 - virtual void Clear(); // vtable+0x1c + virtual void Destroy(); // vtable+0x1c virtual void SetPalette(MxPalette* p_palette); // vtable+0x20 virtual void VTable0x24( LPDDSURFACEDESC, @@ -92,7 +92,7 @@ class MxDisplaySurface : public MxCore { inline MxVideoParam& GetVideoParam() { return this->m_videoParam; } private: - void Reset(); + void Init(); MxVideoParam m_videoParam; // 0x08 LPDIRECTDRAWSURFACE m_ddSurface1; // 0x2c @@ -103,4 +103,7 @@ class MxDisplaySurface : public MxCore { MxU16* m_16bitPal; // 0xa8 }; +// SYNTHETIC: LEGO1 0x100ba580 +// MxDisplaySurface::`scalar deleting destructor' + #endif // MXDISPLAYSURFACE_H