From 30ae89f4835ccff57eb6836515f3b81ff14f381f Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 29 May 2025 05:25:05 +0200 Subject: [PATCH] LegoMeterPresenter: use array deleter + BETA10-only assertion (#1527) * LegoMeterPresenter: use array deleter (cherry picked from commit 0897f75c7ca0b10df2b43783d0e99ff5059a29fb) * assert in LegoCarBUild::InitPresenter is BETA10-only (cherry picked from commit 1a41b62f6f7ae5f5926941e621a740a31d3c745f) --- LEGO1/lego/legoomni/src/build/legocarbuild.cpp | 2 ++ LEGO1/lego/legoomni/src/control/legometerpresenter.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index f6df79fe..bb91179c 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -268,7 +268,9 @@ void LegoCarBuild::InitPresenters() m_Decals_Ctl1 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl1"); m_Decals_Ctl2 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl2"); m_Decal_Bitmap = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); +#ifdef BETA10 assert(m_Decal_Bitmap); +#endif if (m_Decal_Bitmap) { m_Decals_Ctl3 = (MxControlPresenter*) Find("MxControlPresenter", "Decals_Ctl3"); assert(m_Decals_Ctl3); diff --git a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp index 0f45b60c..a55c79e1 100644 --- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp @@ -27,7 +27,7 @@ LegoMeterPresenter::LegoMeterPresenter() // FUNCTION: BETA10 0x1009764a LegoMeterPresenter::~LegoMeterPresenter() { - delete m_meterPixels; + delete[] m_meterPixels; } // FUNCTION: LEGO1 0x10043800