diff --git a/ddraw.rc b/ddraw.rc index 0348145..5f4b0d0 100644 --- a/ddraw.rc +++ b/ddraw.rc @@ -2,7 +2,7 @@ #define vxstr(a,b,c,d) str(a##.##b##.##c##.##d) #define str(s) #s -#define VERSION 1,2,2,3 +#define VERSION 1,2,2,4 1 VERSIONINFO FILEVERSION VERSION diff --git a/src/surface.c b/src/surface.c index b089c1d..31ac999 100644 --- a/src/surface.c +++ b/src/surface.c @@ -184,13 +184,19 @@ HRESULT __stdcall ddraw_surface_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_ #endif if (flags & DDBLTFAST_NOCOLORKEY) + { printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_NOCOLORKEY\n", This); + } if (flags & DDBLTFAST_SRCCOLORKEY) + { printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_SRCCOLORKEY\n", This); + } if (flags & DDBLTFAST_DESTCOLORKEY) + { printf("IDirectDrawSurface::BltFast(This=%p, ...) ??? DDBLTFAST_DESTCOLORKEY\n", This); + } if (Source) { @@ -204,12 +210,13 @@ HRESULT __stdcall ddraw_surface_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_ unsigned char* dstSurface = (unsigned char *)This->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 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];