isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-11 10:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'isle/master'

Browse Source
This commit is contained in:
Christian Semmler 2025-05-14 12:43:45 -07:00
commit 18f24d1795
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONFIG/config.cpp
View File

@ -354,17 +354,17 @@ DWORD CConfigApp::GetConditionalDeviceRenderBitDepth() const
if (GetHardwareDeviceColorModel()) { if (GetHardwareDeviceColorModel()) {
return 0; return 0;
} }
return m_device->m_HELDesc.dwDeviceRenderBitDepth & 0x800; return m_device->m_HELDesc.dwDeviceRenderBitDepth & DDBD_8;
} }
// FUNCTION: CONFIG 0x004037e0 // FUNCTION: CONFIG 0x004037e0
DWORD CConfigApp::GetDeviceRenderBitStatus() const DWORD CConfigApp::GetDeviceRenderBitStatus() const
{ {
if (GetHardwareDeviceColorModel()) { if (GetHardwareDeviceColorModel()) {
return m_device->m_HWDesc.dwDeviceRenderBitDepth & 0x400; return m_device->m_HWDesc.dwDeviceRenderBitDepth & DDBD_16;
} }
else { else {
return m_device->m_HELDesc.dwDeviceRenderBitDepth & 0x400; return m_device->m_HELDesc.dwDeviceRenderBitDepth & DDBD_16;
} }
} }

8
LEGO1/omni/src/video/mxbitmap.cpp
View File

@ -80,7 +80,7 @@ MxResult MxBitmap::SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette,
done: done:
if (ret) { if (ret) {
if (m_info) { if (m_info) {
delete[] m_info; delete[] ((MxU8*) m_info);
m_info = NULL; m_info = NULL;
} }
@ -118,7 +118,7 @@ MxResult MxBitmap::ImportBitmapInfo(MxBITMAPINFO* p_info)
done: done:
if (result != SUCCESS) { if (result != SUCCESS) {
if (m_info) { if (m_info) {
delete[] m_info; delete[] ((MxU8*) m_info);
m_info = NULL; m_info = NULL;
} }
@ -157,7 +157,7 @@ MxResult MxBitmap::ImportBitmap(MxBitmap* p_bitmap)
done: done:
if (result != SUCCESS) { if (result != SUCCESS) {
if (m_info) { if (m_info) {
delete[] m_info; delete[] ((MxU8*) m_info);
m_info = NULL; m_info = NULL;
} }
@ -248,7 +248,7 @@ MxResult MxBitmap::LoadFile(SDL_IOStream* p_handle)
done: done:
if (result != SUCCESS) { if (result != SUCCESS) {
if (m_info) { if (m_info) {
delete[] m_info; delete[] ((MxU8*) m_info);
m_info = NULL; m_info = NULL;
} }