improved MxPalette::Clone, will be 100% when MSVC feels like making it so

This commit is contained in:
ktkaufman03 2023-07-03 18:25:44 -04:00
parent 3ae57f2162
commit 1a69a7c299
No known key found for this signature in database
GPG Key ID: 1E1BF4F2F99E03BB
2 changed files with 7 additions and 10 deletions

View File

@ -35,16 +35,13 @@ void MxPalette::ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries)
// FIXME: we get g_defaultPalette here, we need to define that, then we cna do the memcpy's
}
// OFFSET: LEGO1 100bf0b0
MxPalette* MxPalette::Clone()
// OFFSET: LEGO1 0x100bf0b0
MxPalette& MxPalette::Clone()
{
// FIXME: doesnt match
MxPalette *pal = (MxPalette *) malloc(0x414);
if(pal != NULL) {
GetEntries(pal->m_entries);
pal->m_overrideSkyColor = m_overrideSkyColor;
}
return pal;
MxPalette *result = new MxPalette;
this->GetEntries(result->m_entries);
result->m_overrideSkyColor = this->m_overrideSkyColor;
return *result;
}
// OFFSET: LEGO1 0x100beed0

View File

@ -18,7 +18,7 @@ class MxPalette : public MxCore
virtual ~MxPalette();
void ApplySystemEntriesToPalette(LPPALETTEENTRY p_entries);
MxPalette* Clone();
MxPalette& Clone();
MxPalette* FromBitmapPalette(RGBQUAD* p_bmp);
void GetDefaultPalette(LPPALETTEENTRY p_entries);
MxResult GetEntries(LPPALETTEENTRY p_entries);