diff --git a/LEGO1/mxbitmap.cpp b/LEGO1/mxbitmap.cpp index d9004b31..5987f31f 100644 --- a/LEGO1/mxbitmap.cpp +++ b/LEGO1/mxbitmap.cpp @@ -31,7 +31,7 @@ MxBitmap::~MxBitmap() } // OFFSET: LEGO1 0x100bcc40 -MxResult MxBitmap::vtable14(MxBitmap *p_bitmap) +MxResult MxBitmap::ImportBitmap(MxBitmap *p_bitmap) { MxLong height; MxResult result = FAILURE; @@ -71,7 +71,7 @@ MxResult MxBitmap::vtable14(MxBitmap *p_bitmap) } // OFFSET: LEGO1 0x100bcba0 -MxResult MxBitmap::vtable18(MxBITMAPINFO *p_info) +MxResult MxBitmap::ImportBitmapInfo(MxBITMAPINFO *p_info) { MxResult result = FAILURE; MxLong width = p_info->bmiHeader.biWidth; @@ -130,7 +130,7 @@ MxResult MxBitmap::ImportColorsToPalette(RGBQUAD* p_rgbquad, MxPalette* p_palett } // OFFSET: LEGO1 0x100bcaa0 -MxResult MxBitmap::vtable1c(int p_width, int p_height, MxPalette *p_palette, int p_bitDepth) +MxResult MxBitmap::SetSize(int p_width, int p_height, MxPalette *p_palette, int p_bitDepth) { MxResult ret = FAILURE; MxLong size = ((p_width + 3) & -4) * p_height; @@ -152,7 +152,7 @@ MxResult MxBitmap::vtable1c(int p_width, int p_height, MxPalette *p_palette, int m_bmiHeader->biSizeImage = size; if (!ImportColorsToPalette(m_paletteData, p_palette)) { - if (!vtable3c(p_bitDepth)) { + if (!SetBitDepth(p_bitDepth)) { ret = SUCCESS; } } @@ -312,7 +312,7 @@ void MxBitmap::ImportPalette(MxPalette* p_palette) } // OFFSET: LEGO1 0x100bd2d0 -MxResult MxBitmap::vtable3c(MxBool p_bitDepth) +MxResult MxBitmap::SetBitDepth(MxBool p_bitDepth) { MxResult ret = FAILURE; MxPalette *pal = NULL; @@ -359,7 +359,7 @@ MxResult MxBitmap::vtable3c(MxBool p_bitDepth) } // OFFSET: LEGO1 0x100bd3e0 -MxResult MxBitmap::CopyColorData(HDC p_hdc, int p_xSrc, int p_ySrc, int p_xDest, int p_yDest, int p_destWidth, int p_destHeight) +MxResult MxBitmap::StretchBits(HDC p_hdc, int p_xSrc, int p_ySrc, int p_xDest, int p_yDest, int p_destWidth, int p_destHeight) { // Compression fix? if ((this->m_bmiHeader->biCompression != 16) && (0 < this->m_bmiHeader->biHeight)) { diff --git a/LEGO1/mxbitmap.h b/LEGO1/mxbitmap.h index 344cb0e2..ba90b7da 100644 --- a/LEGO1/mxbitmap.h +++ b/LEGO1/mxbitmap.h @@ -31,18 +31,18 @@ class MxBitmap : public MxCore __declspec(dllexport) MxBitmap(); __declspec(dllexport) virtual ~MxBitmap(); // vtable+00 - virtual MxResult vtable14(MxBitmap *p_bitmap); - virtual MxResult vtable18(MxBITMAPINFO *p_info); - virtual MxResult vtable1c(int p_width, int p_height, MxPalette *p_palette, int); - virtual MxResult LoadFile(HANDLE p_handle); + virtual MxResult ImportBitmap(MxBitmap *p_bitmap); // vtable+14 + virtual MxResult ImportBitmapInfo(MxBITMAPINFO *p_info); // vtable+18 + virtual MxResult SetSize(int p_width, int p_height, MxPalette *p_palette, int); // vtable+1c + virtual MxResult LoadFile(HANDLE p_handle); // vtable+20 __declspec(dllexport) virtual MxLong Read(const char *p_filename); // vtable+24 virtual int vtable28(int); virtual void vtable2c(int, int, int, int, int, int, int); virtual void vtable30(int, int, int, int, int, int, int); __declspec(dllexport) virtual MxPalette *CreatePalette(); // vtable+34 - virtual void ImportPalette(MxPalette* p_palette); - virtual MxResult vtable3c(MxBool); - virtual MxResult CopyColorData(HDC p_hdc, int p_xSrc, int p_ySrc, int p_xDest, int p_yDest, int p_destWidth, int p_destHeight); // vtable+40 + virtual void ImportPalette(MxPalette* p_palette); // vtable+38 + virtual MxResult SetBitDepth(MxBool); // vtable+3c + virtual MxResult StretchBits(HDC p_hdc, int p_xSrc, int p_ySrc, int p_xDest, int p_yDest, int p_destWidth, int p_destHeight); // vtable+40 private: MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);