diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp index cf783331..537191b9 100644 --- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp +++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp @@ -271,7 +271,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 380cb7fc..4e950119 100644 --- a/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp +++ b/LEGO1/lego/legoomni/src/control/legometerpresenter.cpp @@ -28,7 +28,7 @@ LegoMeterPresenter::LegoMeterPresenter() // FUNCTION: BETA10 0x1009764a LegoMeterPresenter::~LegoMeterPresenter() { - delete m_meterPixels; + delete[] m_meterPixels; } // FUNCTION: LEGO1 0x10043800 diff --git a/LEGO1/omni/src/action/mxdsselectaction.cpp b/LEGO1/omni/src/action/mxdsselectaction.cpp index c2c41dc7..c2ee434b 100644 --- a/LEGO1/omni/src/action/mxdsselectaction.cpp +++ b/LEGO1/omni/src/action/mxdsselectaction.cpp @@ -2,6 +2,7 @@ #include "mxmisc.h" #include "mxtimer.h" +#include "mxutilities.h" #include "mxvariabletable.h" #include @@ -100,7 +101,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags) MxString string; MxDSAction::Deserialize(p_source, p_flags); - MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; + MxU32 extraFlag = UnalignedRead(p_source + 4) & 1; p_source += 12; m_unk0x9c = (char*) p_source; @@ -119,7 +120,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags) p_source += strlen((char*) p_source) + 1; - MxU32 count = *(MxU32*) p_source; + MxU32 count = UnalignedRead(p_source); p_source += sizeof(MxU32); if (count) { @@ -137,7 +138,7 @@ void MxDSSelectAction::Deserialize(MxU8*& p_source, MxS16 p_flags) } for (i = 0; i < count; i++) { - MxU32 extraFlag = *(MxU32*) (p_source + 4) & 1; + MxU32 extraFlag = UnalignedRead(p_source + 4) & 1; p_source += 8; action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_flags);