diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp index e832e038..24339ace 100644 --- a/CONFIG/config.cpp +++ b/CONFIG/config.cpp @@ -354,17 +354,17 @@ DWORD CConfigApp::GetConditionalDeviceRenderBitDepth() const if (GetHardwareDeviceColorModel()) { return 0; } - return m_device->m_HELDesc.dwDeviceRenderBitDepth & 0x800; + return m_device->m_HELDesc.dwDeviceRenderBitDepth & DDBD_8; } // FUNCTION: CONFIG 0x004037e0 DWORD CConfigApp::GetDeviceRenderBitStatus() const { if (GetHardwareDeviceColorModel()) { - return m_device->m_HWDesc.dwDeviceRenderBitDepth & 0x400; + return m_device->m_HWDesc.dwDeviceRenderBitDepth & DDBD_16; } else { - return m_device->m_HELDesc.dwDeviceRenderBitDepth & 0x400; + return m_device->m_HELDesc.dwDeviceRenderBitDepth & DDBD_16; } } diff --git a/LEGO1/omni/src/video/mxbitmap.cpp b/LEGO1/omni/src/video/mxbitmap.cpp index 03375bd8..6f09717c 100644 --- a/LEGO1/omni/src/video/mxbitmap.cpp +++ b/LEGO1/omni/src/video/mxbitmap.cpp @@ -80,7 +80,7 @@ MxResult MxBitmap::SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, done: if (ret) { if (m_info) { - delete[] m_info; + delete[] ((MxU8*) m_info); m_info = NULL; } @@ -118,7 +118,7 @@ MxResult MxBitmap::ImportBitmapInfo(MxBITMAPINFO* p_info) done: if (result != SUCCESS) { if (m_info) { - delete[] m_info; + delete[] ((MxU8*) m_info); m_info = NULL; } @@ -157,7 +157,7 @@ MxResult MxBitmap::ImportBitmap(MxBitmap* p_bitmap) done: if (result != SUCCESS) { if (m_info) { - delete[] m_info; + delete[] ((MxU8*) m_info); m_info = NULL; } @@ -248,7 +248,7 @@ MxResult MxBitmap::LoadFile(SDL_IOStream* p_handle) done: if (result != SUCCESS) { if (m_info) { - delete[] m_info; + delete[] ((MxU8*) m_info); m_info = NULL; }