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

Fixes

Browse Source 
- reordered the functions in order of where they are in the hex because recmp.py sometimes kept saying it couldn't find the symbol (??)
- clone returns a pointer, not a ref
- worked a bit on setpalette/applysysentriestopalette
This commit is contained in:
Joshua Peisach 2023-07-04 14:29:06 -04:00
parent ad18611565
commit 2b8480adb3
2 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
LEGO1/mxpalette.cpp
View File

@ -1,5 +1,7 @@
#include "mxpalette.h" #include "mxpalette.h"
LPPALETTEENTRY g_defaultPalette;
// OFFSET: LEGO1 0x100bee30 // OFFSET: LEGO1 0x100bee30
MxPalette::MxPalette() MxPalette::MxPalette()
{ {
@ -32,16 +34,17 @@ void MxPalette::ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries)
ReleaseDC(NULL, hdc); ReleaseDC(NULL, hdc);
} }
} }
// FIXME: we get g_defaultPalette here, we need to define that, then we cna do the memcpy's memcpy(p_entries, g_defaultPalette, 10);
memcpy(p_entries + 0xf6, p_entries + 0xf6, 10);
} }
// OFFSET: LEGO1 0x100bf0b0 // OFFSET: LEGO1 0x100bf0b0
MxPalette& MxPalette::Clone() MxPalette* MxPalette::Clone()
{ {
MxPalette *result = new MxPalette; MxPalette *result = new MxPalette;
this->GetEntries(result->m_entries); this->GetEntries(result->m_entries);
result->m_overrideSkyColor = this->m_overrideSkyColor; result->m_overrideSkyColor = this->m_overrideSkyColor;
return *result; return result;
} }
// OFFSET: LEGO1 0x100beed0 // OFFSET: LEGO1 0x100beed0
@ -55,31 +58,6 @@ MxPalette* MxPalette::FromBitmapPalette(RGBQUAD* p_bmp)
return this; return this;
} }
// OFFSET: LEGO1 0x100bf150
MxResult MxPalette::GetEntries(LPPALETTEENTRY p_entries)
{
memcpy(p_entries, this->m_entries, sizeof(this->m_entries));
return SUCCESS;
}
// OFFSET: LEGO1 0x100bf2d0
MxResult MxPalette::SetSkyColor(LPPALETTEENTRY p_sky_color)
{
int status = 0;
LPDIRECTDRAWPALETTE palette = this->m_palette;
if ( palette )
{
this->m_entries[141].peRed = p_sky_color->peRed;
this->m_entries[141].peGreen = p_sky_color->peGreen;
this->m_entries[141].peBlue = p_sky_color->peBlue;
this->m_skyColor = this->m_entries[141];
if ( palette->SetEntries(0, 141, 1, &this->m_skyColor) )
status = -1;
}
return status;
}
// OFFSET: LEGO1 0x100bf420 // OFFSET: LEGO1 0x100bf420
void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries) void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries)
{ {
@ -102,6 +80,13 @@ void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries)
ReleaseDC((HWND) NULL, hdc); ReleaseDC((HWND) NULL, hdc);
} }
// OFFSET: LEGO1 0x100bf150
MxResult MxPalette::GetEntries(LPPALETTEENTRY p_entries)
{
memcpy(p_entries, this->m_entries, sizeof(this->m_entries));
return SUCCESS;
}
// OFFSET: LEGO1 0x100bf340 // OFFSET: LEGO1 0x100bf340
MxBool MxPalette::operator==(MxPalette &other) MxBool MxPalette::operator==(MxPalette &other)
{ {
@ -124,3 +109,33 @@ void MxPalette::Detach()
this->m_palette = NULL; this->m_palette = NULL;
} }
// OFFSET: LEGO1 0x100bf170
MxResult MxPalette::SetPalette(LPPALETTEENTRY p_palette)
{
int i = 0;
MxResult ret = SUCCESS;
if (this->m_palette != NULL) {
for(int i = 0; i <= 10; i++) {
this->m_entries[i].peFlags = 0x80;
}
}
return ret;
}
// OFFSET: LEGO1 0x100bf2d0
MxResult MxPalette::SetSkyColor(LPPALETTEENTRY p_sky_color)
{
int status = 0;
LPDIRECTDRAWPALETTE palette = this->m_palette;
if ( palette )
{
this->m_entries[141].peRed = p_sky_color->peRed;
this->m_entries[141].peGreen = p_sky_color->peGreen;
this->m_entries[141].peBlue = p_sky_color->peBlue;
this->m_skyColor = this->m_entries[141];
if ( palette->SetEntries(0, 141, 1, &this->m_skyColor) )
status = -1;
}
return status;
}

3
LEGO1/mxpalette.h
View File

@ -18,10 +18,11 @@ class MxPalette : public MxCore
virtual ~MxPalette(); virtual ~MxPalette();
void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries); void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries);
MxPalette& Clone(); MxPalette* Clone();
MxPalette* FromBitmapPalette(RGBQUAD* p_bmp); MxPalette* FromBitmapPalette(RGBQUAD* p_bmp);
void GetDefaultPalette(LPPALETTEENTRY p_entries); void GetDefaultPalette(LPPALETTEENTRY p_entries);
MxResult GetEntries(LPPALETTEENTRY p_entries); MxResult GetEntries(LPPALETTEENTRY p_entries);
MxResult SetPalette(LPPALETTEENTRY p_palette);
MxResult SetSkyColor(LPPALETTEENTRY p_sky_color); MxResult SetSkyColor(LPPALETTEENTRY p_sky_color);
private: private:
LPDIRECTDRAWPALETTE m_palette; LPDIRECTDRAWPALETTE m_palette;