backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

add missing checks

Browse Source
This commit is contained in:
FunkyFr3sh 2024-12-26 01:34:52 +01:00
parent 6855e39464
commit 3e02398e99
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ddsurface.c
View File

@ -77,13 +77,13 @@ HRESULT dds_Blt(
if (lpSrcRect && src_surface) if (lpSrcRect && src_surface)
{ {
//dbg_print_rect("lpSrcRect", lpSrcRect); dbg_print_rect("lpSrcRect", lpSrcRect);
src_rect = *lpSrcRect; src_rect = *lpSrcRect;
} }
if (lpDestRect) if (lpDestRect)
{ {
//dbg_print_rect("lpDestRect", lpDestRect); dbg_print_rect("lpDestRect", lpDestRect);
dst_rect = *lpDestRect; dst_rect = *lpDestRect;
} }
@ -268,7 +268,7 @@ HRESULT dds_Blt(
HDC src_dc; HDC src_dc;
dds_GetDC(src_surface, &src_dc); dds_GetDC(src_surface, &src_dc);
if ((dwFlags & DDBLT_KEYSRC) || (dwFlags & DDBLT_KEYSRCOVERRIDE)) if (((dwFlags & DDBLT_KEYSRC) && (src_surface->flags & DDSD_CKSRCBLT)) || (dwFlags & DDBLT_KEYSRCOVERRIDE))
{ {
UINT color = UINT color =
(dwFlags & DDBLT_KEYSRCOVERRIDE) ? (dwFlags & DDBLT_KEYSRCOVERRIDE) ?
@ -326,7 +326,7 @@ HRESULT dds_Blt(
*/ */
} }
else if ( else if (
(dwFlags & DDBLT_KEYSRC) || ((dwFlags & DDBLT_KEYSRC) && (src_surface->flags & DDSD_CKSRCBLT)) ||
(dwFlags & DDBLT_KEYSRCOVERRIDE) || (dwFlags & DDBLT_KEYSRCOVERRIDE) ||
mirror_left_right || mirror_left_right ||
mirror_up_down) mirror_up_down)
@ -572,7 +572,7 @@ HRESULT dds_BltFast(
HDC src_dc; HDC src_dc;
dds_GetDC(src_surface, &src_dc); dds_GetDC(src_surface, &src_dc);
if (dwFlags & DDBLTFAST_SRCCOLORKEY) if ((dwFlags & DDBLTFAST_SRCCOLORKEY) && (src_surface->flags & DDSD_CKSRCBLT))
{ {
UINT color = src_surface->color_key.dwColorSpaceLowValue; UINT color = src_surface->color_key.dwColorSpaceLowValue;
@ -625,7 +625,7 @@ HRESULT dds_BltFast(
SRCCOPY); SRCCOPY);
*/ */
} }
else if (dwFlags & DDBLTFAST_SRCCOLORKEY) else if ((dwFlags & DDBLTFAST_SRCCOLORKEY) && (src_surface->flags & DDSD_CKSRCBLT))
{ {
blt_colorkey( blt_colorkey(
dst_buf, dst_buf,