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

Add macro for creating RGB555 colors

Browse Source
This commit is contained in:
Anonymous Maarten 2024-12-29 21:13:01 +01:00
parent 0a96125916
commit 1136cfce92
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/omni/src/video/mxdisplaysurface.cpp
View File

@ -13,6 +13,8 @@
DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac); DECOMP_SIZE_ASSERT(MxDisplaySurface, 0xac);
#define RGB555_CREATE(R, G, B) (((R) << 10) | (G) << 5 || (B) << 0)
// GLOBAL: LEGO1 0x1010215c // GLOBAL: LEGO1 0x1010215c
MxU32 g_unk0x1010215c = 0; MxU32 g_unk0x1010215c = 0;
@ -977,7 +979,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
for (MxS32 y = 0; y < heightAbs; y++) { for (MxS32 y = 0; y < heightAbs; y++) {
for (MxS32 x = 0; x < widthNormal; x++) { for (MxS32 x = 0; x < widthNormal; x++) {
if (*bitmapSrcPtr == NULL) { if (*bitmapSrcPtr == NULL) {
*surfaceData = 31775; *surfaceData = RGB555_CREATE(0x1f, 0, 0x1f);
} }
else { else {
*surfaceData = m_16bitPal[*bitmapSrcPtr]; *surfaceData = m_16bitPal[*bitmapSrcPtr];
@ -992,7 +994,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::VTable0x44(
} }
DDCOLORKEY key; DDCOLORKEY key;
key.dwColorSpaceLowValue = key.dwColorSpaceHighValue = 31775; key.dwColorSpaceLowValue = key.dwColorSpaceHighValue = RGB555_CREATE(0x1f, 0, 0x1f);
surface->SetColorKey(DDCKEY_SRCBLT, &key); surface->SetColorKey(DDCKEY_SRCBLT, &key);
} }
else { else {
@ -1098,7 +1100,7 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
for (MxS32 y = 0; y < 16; y++) { for (MxS32 y = 0; y < 16; y++) {
if ((y > 10 || x) && (x > 10 || y) && x + y != 10) { if ((y > 10 || x) && (x > 10 || y) && x + y != 10) {
if (x + y > 10) { if (x + y > 10) {
*surface2 = 31775; *surface2 = RGB555_CREATE(0x1f, 0, 0x1f);
} }
else { else {
*surface2 = -1; *surface2 = -1;
@ -1114,8 +1116,8 @@ LPDIRECTDRAWSURFACE MxDisplaySurface::CreateCursorSurface()
newSurface->Unlock(ddsd.lpSurface); newSurface->Unlock(ddsd.lpSurface);
DDCOLORKEY colorkey; DDCOLORKEY colorkey;
colorkey.dwColorSpaceHighValue = 31775; colorkey.dwColorSpaceHighValue = RGB555_CREATE(0x1f, 0, 0x1f);
colorkey.dwColorSpaceLowValue = 31775; colorkey.dwColorSpaceLowValue = RGB555_CREATE(0x1f, 0, 0x1f);
newSurface->SetColorKey(DDCKEY_SRCBLT, &colorkey); newSurface->SetColorKey(DDCKEY_SRCBLT, &colorkey);
return newSurface; return newSurface;