isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-18 13:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'isle/master'

Browse Source
This commit is contained in:
Christian Semmler 2025-05-17 16:20:08 -07:00
commit c8b1e507c7
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/common/mxcontrolpresenter.cpp
View File

@ -29,7 +29,7 @@ MxControlPresenter::MxControlPresenter()
MxControlPresenter::~MxControlPresenter() MxControlPresenter::~MxControlPresenter()
{ {
if (m_states) { if (m_states) {
delete m_states; delete[] m_states;
} }
} }

2
LEGO1/lego/sources/geom/legowegedge.cpp
View File

@ -35,7 +35,7 @@ LegoWEGEdge::~LegoWEGEdge()
delete[] m_edgeNormals; delete[] m_edgeNormals;
} }
if (m_pathTrigger) { if (m_pathTrigger) {
delete m_pathTrigger; delete[] m_pathTrigger;
} }
if (m_unk0x50) { if (m_unk0x50) {
delete m_unk0x50; delete m_unk0x50;

2
LEGO1/omni/src/video/mxflcpresenter.cpp
View File

@ -21,7 +21,7 @@ MxFlcPresenter::MxFlcPresenter()
MxFlcPresenter::~MxFlcPresenter() MxFlcPresenter::~MxFlcPresenter()
{ {
if (this->m_flcHeader) { if (this->m_flcHeader) {
delete this->m_flcHeader; delete[] ((MxU8*) this->m_flcHeader);
} }
} }

6
LEGO1/omni/src/video/mxstillpresenter.cpp
View File

@ -22,7 +22,7 @@ void MxStillPresenter::Destroy(MxBool p_fromDestructor)
m_criticalSection.Enter(); m_criticalSection.Enter();
if (m_bitmapInfo) { if (m_bitmapInfo) {
delete m_bitmapInfo; delete[] ((MxU8*) m_bitmapInfo);
} }
m_bitmapInfo = NULL; m_bitmapInfo = NULL;
@ -37,7 +37,7 @@ void MxStillPresenter::Destroy(MxBool p_fromDestructor)
void MxStillPresenter::LoadHeader(MxStreamChunk* p_chunk) void MxStillPresenter::LoadHeader(MxStreamChunk* p_chunk)
{ {
if (m_bitmapInfo) { if (m_bitmapInfo) {
delete m_bitmapInfo; delete[] ((MxU8*) m_bitmapInfo);
} }
MxU8* data = new MxU8[p_chunk->GetLength()]; MxU8* data = new MxU8[p_chunk->GetLength()];
@ -55,7 +55,7 @@ void MxStillPresenter::CreateBitmap()
m_frameBitmap = new MxBitmap; m_frameBitmap = new MxBitmap;
m_frameBitmap->ImportBitmapInfo(m_bitmapInfo); m_frameBitmap->ImportBitmapInfo(m_bitmapInfo);
delete m_bitmapInfo; delete[] ((MxU8*) m_bitmapInfo);
m_bitmapInfo = NULL; m_bitmapInfo = NULL;
} }

4
LEGO1/tgl/d3drm/view.cpp
View File

@ -443,9 +443,9 @@ inline Result ViewRender(IDirect3DRMViewport* pViewport, const IDirect3DRMFrame2
pViewportAppData->m_backgroundColorGreen, pViewportAppData->m_backgroundColorGreen,
pViewportAppData->m_backgroundColorBlue pViewportAppData->m_backgroundColorBlue
); );
}
assert(Succeeded(result)); assert(Succeeded(result));
}
result = ResultVal(pViewport->Render(const_cast<IDirect3DRMFrame2*>(pGroup))); result = ResultVal(pViewport->Render(const_cast<IDirect3DRMFrame2*>(pGroup)));
assert(Succeeded(result)); assert(Succeeded(result));