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

Cleanup while i keep getting bored of matching these functions that wont match

Browse Source
This commit is contained in:
Joshua Peisach 2023-08-13 19:26:16 -04:00
parent 35b2cc3572
commit dd318a3295
No known key found for this signature in database
GPG Key ID: 41C3D4189AFEDB5A
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
LEGO1/mxbitmap.cpp
View File

@ -19,11 +19,11 @@ MxBitmap::MxBitmap()
// OFFSET: LEGO1 0x100bca10 // OFFSET: LEGO1 0x100bca10
MxBitmap::~MxBitmap() MxBitmap::~MxBitmap()
{ {
if (this->m_info != NULL) if (this->m_info)
delete m_info; delete m_info;
if (this->m_data != NULL) if (this->m_data)
delete m_data; delete m_data;
if (this->m_palette != NULL) if (this->m_palette)
delete m_palette; delete m_palette;
} }
@ -37,27 +37,25 @@ int MxBitmap::vtable14(int)
MxResult MxBitmap::vtable18(BITMAPINFOHEADER *p_bmiHeader) MxResult MxBitmap::vtable18(BITMAPINFOHEADER *p_bmiHeader)
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
int width = p_bmiHeader->biWidth; MxU32 width = p_bmiHeader->biWidth;
int height = p_bmiHeader->biHeight; MxU32 height = p_bmiHeader->biHeight;
this->m_info = (BITMAPINFO*) malloc(0x428); this->m_info = new BITMAPINFO;
if (this->m_info != NULL) { if (this->m_info) {
this->m_data = (LPVOID*) malloc((width + 3 & -4) * height); this->m_data = (LPVOID*) malloc((sizeof(width + 3U & -4) * height));
if(this->m_data != NULL) { if(this->m_data) {
memcpy(&this->m_info->bmiHeader, p_bmiHeader, 266); memcpy(&this->m_info->bmiHeader, p_bmiHeader, sizeof(BITMAPINFO));
this->m_bmiHeader = &this->m_info->bmiHeader; this->m_bmiHeader = &this->m_info->bmiHeader;
this->m_paletteData = this->m_info->bmiColors; this->m_paletteData = this->m_info->bmiColors;
result = SUCCESS; result = SUCCESS;
} }
} }
if (result != SUCCESS) { if (result != SUCCESS) {
if (this->m_info != NULL) { if (this->m_info) {
delete this->m_info; delete this->m_info;
this->m_info = NULL;
} }
if (this->m_data != NULL) { if (this->m_data) {
delete this->m_data; delete this->m_data;
this->m_data = NULL;
} }
} }
return result; return result;
@ -99,8 +97,8 @@ int MxBitmap::vtable1c(int p_width, int p_height, MxPalette *p_palette, int)
MxResult MxBitmap::LoadFile(HANDLE p_handle) MxResult MxBitmap::LoadFile(HANDLE p_handle)
{ {
LPVOID* lpBuffer; LPVOID* lpBuffer;
MxS32 height; MxU32 height;
MxBool ret; BOOL ret;
MxResult result = FAILURE; MxResult result = FAILURE;
DWORD bytesRead; DWORD bytesRead;
BITMAPFILEHEADER hdr; BITMAPFILEHEADER hdr;
@ -108,12 +106,12 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle)
ret = ReadFile(p_handle, &hdr, sizeof(hdr), &bytesRead, NULL); ret = ReadFile(p_handle, &hdr, sizeof(hdr), &bytesRead, NULL);
if (ret && (hdr.bfType == g_bitmapSignature)) { if (ret && (hdr.bfType == g_bitmapSignature)) {
this->m_info = (BITMAPINFO*) malloc(1064); this->m_info = (BITMAPINFO*) malloc(1064);
if(this->m_info != NULL) { if(this->m_info) {
ret = ReadFile(p_handle, this->m_info, 1064, &bytesRead, NULL); ret = ReadFile(p_handle, this->m_info, 1064, &bytesRead, NULL);
if (ret && ((this->m_info->bmiHeader).biBitCount == 8)) { if (ret && ((this->m_info->bmiHeader).biBitCount == 8)) {
lpBuffer = (LPVOID*) malloc(hdr.bfSize - 1078); lpBuffer = (LPVOID*) malloc(hdr.bfSize - 1078);
this->m_data = lpBuffer; this->m_data = lpBuffer;
if (this->m_data != NULL) { if (this->m_data) {
ret = ReadFile(p_handle, lpBuffer, hdr.bfSize - 1078, &bytesRead, NULL); ret = ReadFile(p_handle, lpBuffer, hdr.bfSize - 1078, &bytesRead, NULL);
if(ret != 0) { if(ret != 0) {
this->m_bmiHeader = &this->m_info->bmiHeader; this->m_bmiHeader = &this->m_info->bmiHeader;
@ -121,9 +119,9 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle)
if((this->m_info->bmiHeader).biSizeImage == 0) { if((this->m_info->bmiHeader).biSizeImage == 0) {
height = (this->m_info->bmiHeader).biHeight; height = (this->m_info->bmiHeader).biHeight;
if (height < 1) { if (height < 1) {
height *= -1; height = -height;
} }
(this->m_info->bmiHeader).biSizeImage = ((this->m_info->bmiHeader).biWidth + 3U & 0xfffffffc) * height; (this->m_info->bmiHeader).biSizeImage = ((this->m_info->bmiHeader).biWidth + 3U & -4) * height;
} }
result = SUCCESS; result = SUCCESS;
} }
@ -132,13 +130,11 @@ MxResult MxBitmap::LoadFile(HANDLE p_handle)
} }
} }
if (result != SUCCESS) { if (result != SUCCESS) {
if (this->m_info != NULL) { if (this->m_info) {
delete this->m_info; delete this->m_info;
this->m_info = NULL;
} }
if (this->m_data != NULL) { if (this->m_data) {
delete this->m_data; delete this->m_data;
this->m_data = NULL;
} }
} }
return result; return result;
@ -186,7 +182,6 @@ void MxBitmap::vtable30(int, int, int, int, int, int, int)
// OFFSET: LEGO1 0x100bd1c0 // OFFSET: LEGO1 0x100bd1c0
MxPalette *MxBitmap::CreatePalette() MxPalette *MxBitmap::CreatePalette()
{ {
// FIXME: doesn't match
MxPalette *pal; MxPalette *pal;
MxPalette *ppal; MxPalette *ppal;
MxBool success; MxBool success;
@ -195,19 +190,18 @@ MxPalette *MxBitmap::CreatePalette()
success = FALSE; success = FALSE;
if(this->m_bmiColorsProvided == FALSE) { if(this->m_bmiColorsProvided == FALSE) {
ppal = new MxPalette(this->m_paletteData); ppal = new MxPalette(this->m_paletteData);
if (ppal != NULL) { if (ppal) {
pal = ppal; pal = ppal;
} }
} else { } else {
if(this->m_bmiColorsProvided != TRUE) { if(this->m_bmiColorsProvided != TRUE) {
if(!success && pal != NULL) { if(!success && pal) {
delete pal; delete pal;
pal = NULL;
} }
} }
pal = this->m_palette->Clone(); pal = this->m_palette->Clone();
} }
if(pal != NULL) { if(pal) {
success = TRUE; success = TRUE;
} }
@ -220,7 +214,7 @@ void MxBitmap::ImportPalette(MxPalette* p_palette)
if (this->m_bmiColorsProvided) { if (this->m_bmiColorsProvided) {
ImportColorsToPalette(this->m_paletteData, p_palette); ImportColorsToPalette(this->m_paletteData, p_palette);
} }
if (this->m_palette != NULL) { if (this->m_palette) {
delete this->m_palette; delete this->m_palette;
} }
this->m_palette = p_palette->Clone(); this->m_palette = p_palette->Clone();