mirror of
https://github.com/isledecomp/isle-portable.git
synced 2025-09-24 04:26:55 -04:00
Merge remote-tracking branch 'isle/master'
This commit is contained in:
commit
c8b1e507c7
@ -29,7 +29,7 @@ MxControlPresenter::MxControlPresenter()
|
||||
MxControlPresenter::~MxControlPresenter()
|
||||
{
|
||||
if (m_states) {
|
||||
delete m_states;
|
||||
delete[] m_states;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@ LegoWEGEdge::~LegoWEGEdge()
|
||||
delete[] m_edgeNormals;
|
||||
}
|
||||
if (m_pathTrigger) {
|
||||
delete m_pathTrigger;
|
||||
delete[] m_pathTrigger;
|
||||
}
|
||||
if (m_unk0x50) {
|
||||
delete m_unk0x50;
|
||||
|
@ -21,7 +21,7 @@ MxFlcPresenter::MxFlcPresenter()
|
||||
MxFlcPresenter::~MxFlcPresenter()
|
||||
{
|
||||
if (this->m_flcHeader) {
|
||||
delete this->m_flcHeader;
|
||||
delete[] ((MxU8*) this->m_flcHeader);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@ void MxStillPresenter::Destroy(MxBool p_fromDestructor)
|
||||
m_criticalSection.Enter();
|
||||
|
||||
if (m_bitmapInfo) {
|
||||
delete m_bitmapInfo;
|
||||
delete[] ((MxU8*) m_bitmapInfo);
|
||||
}
|
||||
m_bitmapInfo = NULL;
|
||||
|
||||
@ -37,7 +37,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()];
|
||||
@ -55,7 +55,7 @@ void MxStillPresenter::CreateBitmap()
|
||||
m_frameBitmap = new MxBitmap;
|
||||
m_frameBitmap->ImportBitmapInfo(m_bitmapInfo);
|
||||
|
||||
delete m_bitmapInfo;
|
||||
delete[] ((MxU8*) m_bitmapInfo);
|
||||
m_bitmapInfo = NULL;
|
||||
}
|
||||
|
||||
|
@ -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<IDirect3DRMFrame2*>(pGroup)));
|
||||
assert(Succeeded(result));
|
||||
|
Loading…
x
Reference in New Issue
Block a user