mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve order until legomain.cpp (#1350)

Browse Source 
* Fix `LegoBackgroundColor` order

* Order

* Improve order in Act3Actors

* Improve order

* Add BETA annotation

* Order more

* More order

* More order

* Order

* Match/order

* Remove blank line

* Modern compiler fix

* vtable annotation
This commit is contained in:
Christian Semmler
2025-01-17 18:33:27 -07:00
committed by GitHub
parent e1ce96c473
commit fc03e7a682
24 changed files with 218 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
LEGO1/omni/include/mxbitmap.h
View File

@@ -40,15 +40,15 @@ public:
MxBitmap();
~MxBitmap() override; // vtable+00
virtual MxResult ImportBitmap(MxBitmap* p_bitmap); // vtable+14
virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info); // vtable+18
virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, MxBool); // vtable+1c
virtual MxResult LoadFile(HANDLE p_handle); // vtable+20
virtual MxLong Read(const char* p_filename); // vtable+24
virtual MxResult ImportBitmap(MxBitmap* p_bitmap); // vtable+0x14
virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info); // vtable+0x18
virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, MxBool); // vtable+0x1c
virtual MxResult LoadFile(HANDLE p_handle); // vtable+0x20
virtual MxLong Read(const char* p_filename); // vtable+0x24
// FUNCTION: LEGO1 0x1004e0d0
// FUNCTION: BETA10 0x10060fc0
virtual int VTable0x28(int) { return -1; } // vtable+28
virtual MxS32 VTable0x28(MxS32) { return -1; } // vtable+0x28
virtual void BitBlt(
MxBitmap* p_src,
@@ -58,7 +58,7 @@ public:
MxS32 p_bottom,
MxS32 p_width,
MxS32 p_height
); // vtable+2c
); // vtable+0x2c
virtual void BitBltTransparent(
MxBitmap* p_src,
MxS32 p_left,
@@ -67,10 +67,10 @@ public:
MxS32 p_bottom,
MxS32 p_width,
MxS32 p_height
); // vtable+30
virtual MxPalette* CreatePalette(); // vtable+34
virtual void ImportPalette(MxPalette* p_palette); // vtable+38
virtual MxResult SetBitDepth(MxBool); // vtable+3c
); // vtable+0x30
virtual MxPalette* CreatePalette(); // vtable+0x34
virtual void ImportPalette(MxPalette* p_palette); // vtable+0x38
virtual MxResult SetBitDepth(MxBool); // vtable+0x3c
virtual MxResult StretchBits(
HDC p_hdc,
MxS32 p_xSrc,
@@ -79,7 +79,7 @@ public:
MxS32 p_yDest,
MxS32 p_destWidth,
MxS32 p_destHeight
); // vtable+40
); // vtable+0x40
// Bit mask trick to round up to the nearest multiple of four.
// Pixel data may be stored with padding.

15
LEGO1/omni/include/mxstillpresenter.h
View File

@@ -13,6 +13,9 @@ public:
// FUNCTION: LEGO1 0x10043550
~MxStillPresenter() override { Destroy(TRUE); } // vtable+0x00
// FUNCTION: LEGO1 0x100435b0
void Destroy() override { Destroy(FALSE); } // vtable+0x38
// FUNCTION: BETA10 0x100980c0
static const char* HandlerClassName()
{
@@ -33,14 +36,10 @@ public:
return !strcmp(p_name, MxStillPresenter::ClassName()) || MxVideoPresenter::IsA(p_name);
}
void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20
void RepeatingTickle() override; // vtable+0x24
void ParseExtra() override; // vtable+0x30
// FUNCTION: LEGO1 0x100435b0
void Destroy() override { Destroy(FALSE); } // vtable+0x38
void StartingTickle() override; // vtable+0x1c
void StreamingTickle() override; // vtable+0x20
void RepeatingTickle() override; // vtable+0x24
void ParseExtra() override; // vtable+0x30
void Enable(MxBool p_enable) override; // vtable+0x54
void LoadHeader(MxStreamChunk* p_chunk) override; // vtable+0x5c
void CreateBitmap() override; // vtable+0x60