Merge pull request #7 from foxtacles/mxbitmap-create

Match MxBitmap::CreatePalette
This commit is contained in:
Joshua Peisach 2023-08-22 12:36:09 -04:00 committed by GitHub
commit f2642c62c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -229,30 +229,29 @@ void MxBitmap::vtable30(int, int, int, int, int, int, int)
// OFFSET: LEGO1 0x100bd1c0 // OFFSET: LEGO1 0x100bd1c0
MxPalette *MxBitmap::CreatePalette() MxPalette *MxBitmap::CreatePalette()
{ {
MxPalette *pal; MxPalette *palette = NULL;
MxPalette *ppal; MxBool success = FALSE;
MxResult success;
pal = NULL; switch (this->m_bitDepth) {
success = FALSE; case LOWCOLOR:
if(this->m_bitDepth == LOWCOLOR) { palette = new MxPalette(this->m_paletteData);
ppal = new MxPalette(this->m_paletteData); if (palette)
if (ppal) { success = TRUE;
pal = ppal; break;
}
} else { case HIGHCOLOR:
if(this->m_bitDepth != HIGHCOLOR) { palette = this->m_palette->Clone();
if(!success && pal) { if (palette)
delete pal; success = TRUE;
} break;
}
pal = this->m_palette->Clone();
}
if(pal) {
success = TRUE;
} }
return pal; if (!success && palette) {
delete palette;
palette = NULL;
}
return palette;
} }
// OFFSET: LEGO1 0x100bd280 // OFFSET: LEGO1 0x100bd280