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 #1 from foxtacles/palette-structure

Browse Source 
Fix MxPalette structure and match ctor/dtor
This commit is contained in:
Joshua Peisach 2023-06-29 19:39:31 -04:00 committed by GitHub
commit ad86cd14fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/mxpalette.cpp
View File

@ -4,16 +4,17 @@
MxPalette::MxPalette() MxPalette::MxPalette()
{ {
this->m_overrideSkyColor = FALSE; this->m_overrideSkyColor = FALSE;
this->m_attached = NULL; this->m_palette = NULL;
GetDefaultPalette(this->m_entries); GetDefaultPalette(this->m_entries);
this->m_skyColor = this->m_entries[141]; this->m_skyColor = this->m_entries[141];
// FIXME: Incomplete
} }
// OFFSET: LEGO1 100bef90 // OFFSET: LEGO1 100bef90
MxPalette::~MxPalette() MxPalette::~MxPalette()
{ {
delete m_attached; // yes this matches more if (m_palette) {
m_palette->Release();
}
} }
// OFFSET: LEGO1 100bf0b0 // OFFSET: LEGO1 100bf0b0
@ -55,5 +56,5 @@ void MxPalette::GetDefaultPalette(LPPALETTEENTRY p_entries)
// OFFSET: LEGO1 0x100bf330 // OFFSET: LEGO1 0x100bf330
void MxPalette::Detach() void MxPalette::Detach()
{ {
this->m_attached = NULL; this->m_palette = NULL;
} }

4
LEGO1/mxpalette.h
View File

@ -15,13 +15,13 @@ class MxPalette : public MxCore
__declspec(dllexport) void Detach(); __declspec(dllexport) void Detach();
MxPalette(); MxPalette();
~MxPalette(); virtual ~MxPalette();
MxPalette* Clone(); MxPalette* Clone();
void GetDefaultPalette(LPPALETTEENTRY p_entries); void GetDefaultPalette(LPPALETTEENTRY p_entries);
MxResult GetEntries(LPPALETTEENTRY p_entries); MxResult GetEntries(LPPALETTEENTRY p_entries);
private: private:
MxCore *m_attached;
LPDIRECTDRAWPALETTE m_palette; LPDIRECTDRAWPALETTE m_palette;
PALETTEENTRY m_entries[256]; PALETTEENTRY m_entries[256];
MxBool m_overrideSkyColor; MxBool m_overrideSkyColor;