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

Merge pull request #6 from disinvite/mxbitmap

Browse Source 
Match vtable1c and vtable3c
This commit is contained in:
Joshua Peisach 2023-08-15 21:30:29 -04:00 committed by GitHub
commit 572d417ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 86 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
LEGO1/mxbitmap.cpp
View File

@ -95,10 +95,49 @@ MxResult MxBitmap::ImportColorsToPalette(RGBQUAD* p_rgbquad, MxPalette* p_palett
return ret; return ret;
} }
// OFFSET: LEGO1 0x100bcaa0 STUB // OFFSET: LEGO1 0x100bcaa0
int MxBitmap::vtable1c(int p_width, int p_height, MxPalette *p_palette, int) int MxBitmap::vtable1c(int p_width, int p_height, MxPalette *p_palette, int p_option)
{ {
return 0; MxResult ret = FAILURE;
MxLong size = ((p_width + 3) & -4) * p_height;
m_info = new MxBITMAPINFO;
if (m_info) {
m_data = (LPVOID*) new MxU8[size];
if (m_data) {
m_bmiHeader = &m_info->bmiHeader;
m_paletteData = m_info->bmiColors;
memset(&m_info->bmiHeader, 0, sizeof(m_info->bmiHeader));
m_bmiHeader->biSize = sizeof(*m_bmiHeader); // should be 40 bytes
m_bmiHeader->biWidth = p_width;
m_bmiHeader->biHeight = p_height;
m_bmiHeader->biPlanes = 1;
m_bmiHeader->biBitCount = 8;
m_bmiHeader->biCompression = 0;
m_bmiHeader->biSizeImage = size;
if (!ImportColorsToPalette(m_paletteData, p_palette)) {
if (!vtable3c(p_option)) {
ret = SUCCESS;
}
}
}
}
if (ret) {
if (m_info) {
delete m_info;
m_info = NULL;
}
if (m_data) {
delete[] m_data;
m_data = NULL;
}
}
return ret;
} }
// OFFSET: LEGO1 0x100bcd60 // OFFSET: LEGO1 0x100bcd60
@ -235,10 +274,51 @@ void MxBitmap::ImportPalette(MxPalette* p_palette)
} }
} }
// OFFSET: LEGO1 0x100bd2d0 STUB // OFFSET: LEGO1 0x100bd2d0
int MxBitmap::vtable3c(MxBool) int MxBitmap::vtable3c(MxBool p_option)
{ {
return 0; MxResult ret = FAILURE;
MxPalette *pal = NULL;
if (m_bmiColorsProvided == p_option) {
// no change: do nothing.
ret = SUCCESS;
} else {
// TODO: Another switch used for this boolean value? Is it not a bool?
switch (p_option) {
case 0:
ImportColorsToPalette(m_paletteData, m_palette);
if (m_palette)
delete m_palette;
m_palette = NULL;
break;
case 1:
pal = NULL;
pal = new MxPalette(m_paletteData);
if (pal) {
m_palette = pal;
// TODO: what is this? zeroing out top half of palette?
MxU16 *buf = (MxU16*)m_paletteData;
for (MxU16 i = 0; i < 256; i++) {
buf[i] = i;
}
m_bmiColorsProvided = p_option;
ret = SUCCESS;
}
break;
}
}
// If we were unsuccessful overall but did manage to alloc
// the MxPalette, free it.
if (ret && pal)
delete pal;
return ret;
} }
// OFFSET: LEGO1 0x100bd3e0 // OFFSET: LEGO1 0x100bd3e0