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

add support for DDBLT_KEYSRCOVERRIDE and dwColorSpaceHighValue

Browse Source
This commit is contained in:
FunkyFr3sh 2019-05-02 22:46:00 +02:00
parent 3c3ef9de7f
commit 4e869e7d03
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/surface.c
View File

@ -211,8 +211,18 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
if (Source) if (Source)
{ {
if (dwFlags & DDBLT_KEYSRC) if ((dwFlags & DDBLT_KEYSRC) || (dwFlags & DDBLT_KEYSRCOVERRIDE))
{ {
DDCOLORKEY colorKey;
colorKey.dwColorSpaceLowValue =
(dwFlags & DDBLT_KEYSRCOVERRIDE) ?
lpDDBltFx->ddckSrcColorkey.dwColorSpaceLowValue : Source->colorKey.dwColorSpaceLowValue;
colorKey.dwColorSpaceHighValue =
(dwFlags & DDBLT_KEYSRCOVERRIDE) ?
lpDDBltFx->ddckSrcColorkey.dwColorSpaceHighValue : Source->colorKey.dwColorSpaceHighValue;
if (!isStretchBlt) if (!isStretchBlt)
{ {
int width = dst_w > src_w ? src_w : dst_w; int width = dst_w > src_w ? src_w : dst_w;
@ -230,7 +240,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
{ {
unsigned char c = ((unsigned char *)Source->surface)[x1 + src_x + ysrc]; unsigned char c = ((unsigned char *)Source->surface)[x1 + src_x + ysrc];
if (c != Source->colorKey.dwColorSpaceLowValue) if (c < colorKey.dwColorSpaceLowValue || c > colorKey.dwColorSpaceHighValue)
{ {
((unsigned char *)This->surface)[x1 + dst_x + ydst] = c; ((unsigned char *)This->surface)[x1 + dst_x + ydst] = c;
} }
@ -249,7 +259,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
{ {
unsigned short c = ((unsigned short *)Source->surface)[x1 + src_x + ysrc]; unsigned short c = ((unsigned short *)Source->surface)[x1 + src_x + ysrc];
if (c != Source->colorKey.dwColorSpaceLowValue) if (c < colorKey.dwColorSpaceLowValue || c > colorKey.dwColorSpaceHighValue)
{ {
((unsigned short *)This->surface)[x1 + dst_x + ydst] = c; ((unsigned short *)This->surface)[x1 + dst_x + ydst] = c;
} }
@ -259,7 +269,7 @@ HRESULT __stdcall ddraw_surface_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestR
} }
else else
{ {
printf(" DDBLT_KEYSRC does not support stretching"); printf(" DDBLT_KEYSRC / DDBLT_KEYSRCOVERRIDE does not support stretching");
} }
} }
else else
@ -546,7 +556,7 @@ HRESULT __stdcall ddraw_surface_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_
{ {
unsigned char c = ((unsigned char *)Source->surface)[x1 + src_x + ysrc]; unsigned char c = ((unsigned char *)Source->surface)[x1 + src_x + ysrc];
if (c != Source->colorKey.dwColorSpaceLowValue) if (c < Source->colorKey.dwColorSpaceLowValue || c > Source->colorKey.dwColorSpaceHighValue)
{ {
((unsigned char *)This->surface)[x1 + dst_x + ydst] = c; ((unsigned char *)This->surface)[x1 + dst_x + ydst] = c;
} }
@ -565,7 +575,7 @@ HRESULT __stdcall ddraw_surface_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_
{ {
unsigned short c = ((unsigned short *)Source->surface)[x1 + src_x + ysrc]; unsigned short c = ((unsigned short *)Source->surface)[x1 + src_x + ysrc];
if (c != Source->colorKey.dwColorSpaceLowValue) if (c < Source->colorKey.dwColorSpaceLowValue || c > Source->colorKey.dwColorSpaceHighValue)
{ {
((unsigned short *)This->surface)[x1 + dst_x + ydst] = c; ((unsigned short *)This->surface)[x1 + dst_x + ydst] = c;
} }