From 2d92aee5896b488dfc0eac9b7b530e33577e4b8e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 17 May 2025 22:24:06 +0200 Subject: [PATCH 1/5] Correct delete[] in mxcontrolpresenter.cpp (#1498) --- LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp index 17beb3c1..4b412940 100644 --- a/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp +++ b/LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp @@ -28,7 +28,7 @@ MxControlPresenter::MxControlPresenter() MxControlPresenter::~MxControlPresenter() { if (m_states) { - delete m_states; + delete[] m_states; } } From d3cd491765746b250d9fe0a244b5c5da48e79983 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 17 May 2025 22:25:22 +0200 Subject: [PATCH 2/5] Correct delete[] in legowegedge.cpp (#1499) --- LEGO1/lego/sources/geom/legowegedge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/lego/sources/geom/legowegedge.cpp b/LEGO1/lego/sources/geom/legowegedge.cpp index 110cd2c6..5c3a68d2 100644 --- a/LEGO1/lego/sources/geom/legowegedge.cpp +++ b/LEGO1/lego/sources/geom/legowegedge.cpp @@ -35,7 +35,7 @@ LegoWEGEdge::~LegoWEGEdge() delete[] m_edgeNormals; } if (m_pathTrigger) { - delete m_pathTrigger; + delete[] m_pathTrigger; } if (m_unk0x50) { delete m_unk0x50; From bc920a295b2bd5879c3f75edd761669653fac154 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 17 May 2025 22:26:01 +0200 Subject: [PATCH 3/5] Correct assert in view.cpp (#1500) --- LEGO1/tgl/d3drm/view.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LEGO1/tgl/d3drm/view.cpp b/LEGO1/tgl/d3drm/view.cpp index aba7df5a..654528fe 100644 --- a/LEGO1/tgl/d3drm/view.cpp +++ b/LEGO1/tgl/d3drm/view.cpp @@ -443,9 +443,9 @@ inline Result ViewRender(IDirect3DRMViewport* pViewport, const IDirect3DRMFrame2 pViewportAppData->m_backgroundColorGreen, pViewportAppData->m_backgroundColorBlue ); - } - assert(Succeeded(result)); + assert(Succeeded(result)); + } result = ResultVal(pViewport->Render(const_cast(pGroup))); assert(Succeeded(result)); From 45e0e5bdd15ff211ca703d8d4824084f9180669b Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sat, 17 May 2025 23:22:30 +0200 Subject: [PATCH 4/5] Correct delete[] in mxflcpresenter.cpp (#1501) * Correct delete[] in mxflcpresenter.cpp * Update LEGO1/omni/src/video/mxflcpresenter.cpp Co-authored-by: Christian Semmler --------- Co-authored-by: Christian Semmler --- LEGO1/omni/src/video/mxflcpresenter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/omni/src/video/mxflcpresenter.cpp b/LEGO1/omni/src/video/mxflcpresenter.cpp index 57b734c1..eb075357 100644 --- a/LEGO1/omni/src/video/mxflcpresenter.cpp +++ b/LEGO1/omni/src/video/mxflcpresenter.cpp @@ -21,7 +21,7 @@ MxFlcPresenter::MxFlcPresenter() MxFlcPresenter::~MxFlcPresenter() { if (this->m_flcHeader) { - delete this->m_flcHeader; + delete[] ((MxU8*) this->m_flcHeader); } } From 3f0fe654fff71505d4982c00b68a4944424031d2 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 18 May 2025 01:14:25 +0200 Subject: [PATCH 5/5] Fix delete[] in mxstillpresenter.cpp (#1496) * Fix delete[] in mxstillpresenter.cpp Without this the game doesn't run on Linux :) * Update LEGO1/omni/src/video/mxstillpresenter.cpp Co-authored-by: Christian Semmler * Update mxstillpresenter.cpp --------- Co-authored-by: Christian Semmler --- LEGO1/omni/src/video/mxstillpresenter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/omni/src/video/mxstillpresenter.cpp b/LEGO1/omni/src/video/mxstillpresenter.cpp index 03ffcb31..a9731233 100644 --- a/LEGO1/omni/src/video/mxstillpresenter.cpp +++ b/LEGO1/omni/src/video/mxstillpresenter.cpp @@ -20,7 +20,7 @@ void MxStillPresenter::Destroy(MxBool p_fromDestructor) m_criticalSection.Enter(); if (m_bitmapInfo) { - delete m_bitmapInfo; + delete[] ((MxU8*) m_bitmapInfo); } m_bitmapInfo = NULL; @@ -35,7 +35,7 @@ void MxStillPresenter::Destroy(MxBool p_fromDestructor) void MxStillPresenter::LoadHeader(MxStreamChunk* p_chunk) { if (m_bitmapInfo) { - delete m_bitmapInfo; + delete[] ((MxU8*) m_bitmapInfo); } MxU8* data = new MxU8[p_chunk->GetLength()]; @@ -53,7 +53,7 @@ void MxStillPresenter::CreateBitmap() m_frameBitmap = new MxBitmap; m_frameBitmap->ImportBitmapInfo(m_bitmapInfo); - delete m_bitmapInfo; + delete[] ((MxU8*) m_bitmapInfo); m_bitmapInfo = NULL; }