lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump version

Browse source
This commit is contained in:
FunkyFr3sh 2018-10-26 08:46:12 +02:00
parent 2d1ab88f85
commit 88faf16fd9
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ddraw.rc
View file

@ -2,7 +2,7 @@
#define vxstr(a,b,c,d) str(a##.##b##.##c##.##d) #define vxstr(a,b,c,d) str(a##.##b##.##c##.##d)
#define str(s) #s #define str(s) #s
#define VERSION 1,2,2,3 #define VERSION 1,2,2,4
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION VERSION FILEVERSION VERSION

11
src/surface.c
View file

@ -184,13 +184,19 @@ HRESULT __stdcall ddraw_surface_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_
#endif #endif
if (flags & DDBLTFAST_NOCOLORKEY) if (flags & DDBLTFAST_NOCOLORKEY)
{
printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_NOCOLORKEY\n", This); printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_NOCOLORKEY\n", This);
}
if (flags & DDBLTFAST_SRCCOLORKEY) if (flags & DDBLTFAST_SRCCOLORKEY)
{
printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_SRCCOLORKEY\n", This); printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_SRCCOLORKEY\n", This);
}
if (flags & DDBLTFAST_DESTCOLORKEY) if (flags & DDBLTFAST_DESTCOLORKEY)
{
printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_DESTCOLORKEY\n", This); printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_DESTCOLORKEY\n", This);
}
if (Source) if (Source)
{ {
@ -204,12 +210,13 @@ HRESULT __stdcall ddraw_surface_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_
unsigned char* dstSurface = (unsigned char *)This->surface; unsigned char* dstSurface = (unsigned char *)This->surface;
unsigned char* srcSurface = (unsigned char *)Source->surface; unsigned char* srcSurface = (unsigned char *)Source->surface;
for (int y1 = 0; y1 < src_h; y1++) int y1, x1;
for (y1 = 0; y1 < src_h; y1++)
{ {
int ydst = This->width * (y1 + dst_y); int ydst = This->width * (y1 + dst_y);
int ysrc = Source->width * (y1 + src_y); int ysrc = Source->width * (y1 + src_y);
for (int x1 = 0; x1 < src_w; x1++) for (x1 = 0; x1 < src_w; x1++)
{ {
unsigned char index = srcSurface[x1 + src_x + ysrc]; unsigned char index = srcSurface[x1 + src_x + ysrc];