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 4 Packages Projects Releases Wiki Activity

Push MxPalette progress - read comments in code.

Browse Source
This commit is contained in:
Joshua Peisach 2023-07-02 21:26:39 -04:00
parent 7a8c18ca44
commit 7e3b925e3e
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
LEGO1/mxpalette.cpp
View File

@ -47,6 +47,17 @@ MxPalette* MxPalette::Clone()
return pal; return pal;
} }
// OFFSET: LEGO1 0x100beed0
MxPalette* MxPalette::FromBitmapPalette(RGBQUAD* p_bmp)
{
// FIXME: Incomplete
this->m_overrideSkyColor = FALSE;
ApplySystemEntriesToPalette(this->m_entries);
memcpy(this->m_entries + 10, &p_bmp[10], 246);
this->m_skyColor = this->m_entries[141];
return this;
}
// OFFSET: LEGO1 0x100bf150 // OFFSET: LEGO1 0x100bf150
MxResult MxPalette::GetEntries(LPPALETTEENTRY p_entries) MxResult MxPalette::GetEntries(LPPALETTEENTRY p_entries)
{ {
@ -89,11 +100,24 @@ void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries)
} }
// OFFSET: LEGO1 0x100bf340 // OFFSET: LEGO1 0x100bf340
MxBool MxPalette::operator==(MxPalette &) MxBool MxPalette::operator==(MxPalette *p_palette)
{ {
// TODO // FIXME: ok, idk what is happening here: trying memcpy in different ways showed 0.00% match. Here is literally what it does.
return FALSE; // My guess is that memcpy doesn't break its loop when something is incorrect, and this function is only intended to check
// the RGB and memcpy does everything? The paramater 'rhs' in ghidra suggests it was likely some memcmp. For now,
// this is literally down to instruction swap.
int i = 0;
PALETTEENTRY *our = this->m_entries;
PALETTEENTRY *their = p_palette->m_entries;
do {
if(our->peRed != their->peRed) return FALSE;
if(our->peGreen != their->peGreen) return FALSE;
if(our->peBlue != their->peBlue) return FALSE;
their += 1;
our += 1;
i += 1;
} while (i < 256);
return TRUE;
} }
// OFFSET: LEGO1 0x100bf330 // OFFSET: LEGO1 0x100bf330

3
LEGO1/mxpalette.h
View File

@ -11,7 +11,7 @@
class MxPalette : public MxCore class MxPalette : public MxCore
{ {
public: public:
__declspec(dllexport) MxBool operator==(MxPalette &); __declspec(dllexport) MxBool operator==(MxPalette *p_palette);
__declspec(dllexport) void Detach(); __declspec(dllexport) void Detach();
MxPalette(); MxPalette();
@ -19,6 +19,7 @@ class MxPalette : public MxCore
void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries); void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries);
MxPalette* Clone(); MxPalette* Clone();
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 SetSkyColor(LPPALETTEENTRY p_entries); MxResult SetSkyColor(LPPALETTEENTRY p_entries);