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

#89 fixes blt/blitfast where source and dest sourface are the same

Browse Source
This commit is contained in:
FunkyFr3sh 2021-05-02 16:21:06 +02:00
parent 9be9c6c00e
commit a52881eb72
2 changed files with 71 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.c
View File

@ -547,6 +547,11 @@ static void cfg_create_ini()
"[Cultures2MP]\n" "[Cultures2MP]\n"
"handlemouse=false\n" "handlemouse=false\n"
"\n" "\n"
"; Blade & Sword\n"
"[comeon]\n"
"renderer=opengl\n"
"nonexclusive=true\n"
"\n"
, fh); , fh);
fclose(fh); fclose(fh);

75
src/ddsurface.c
View File

@ -200,13 +200,41 @@ HRESULT dds_Blt(IDirectDrawSurfaceImpl *This, LPRECT lpDestRect, LPDIRECTDRAWSUR
unsigned int dst_pitch = width * This->lx_pitch; unsigned int dst_pitch = width * This->lx_pitch;
int i; if (This == src_surface)
for (i = 0; i < height; i++)
{ {
memcpy(dst, src, dst_pitch); if (dst_y > src_y)
{
src += src_surface->l_pitch * height;
dst += This->l_pitch * height;
src += src_surface->l_pitch; for (int i = height; i-- > 0;)
dst += This->l_pitch; {
src -= src_surface->l_pitch;
dst -= This->l_pitch;
memmove(dst, src, dst_pitch);
}
}
else
{
for (int i = 0; i < height; i++)
{
memmove(dst, src, dst_pitch);
src += src_surface->l_pitch;
dst += This->l_pitch;
}
}
}
else
{
for (int i = 0; i < height; i++)
{
memcpy(dst, src, dst_pitch);
src += src_surface->l_pitch;
dst += This->l_pitch;
}
} }
} }
else else
@ -491,12 +519,41 @@ HRESULT dds_BltFast(IDirectDrawSurfaceImpl *This, DWORD dst_x, DWORD dst_y, LPDI
unsigned int dst_pitch = dst_w * This->lx_pitch; unsigned int dst_pitch = dst_w * This->lx_pitch;
for (int i = 0; i < dst_h; i++) if (This == src_surface)
{ {
memcpy(dst, src, dst_pitch); if (dst_y > src_y)
{
src += src_surface->l_pitch * dst_h;
dst += This->l_pitch * dst_h;
src += src_surface->l_pitch; for (int i = dst_h; i-- > 0;)
dst += This->l_pitch; {
src -= src_surface->l_pitch;
dst -= This->l_pitch;
memmove(dst, src, dst_pitch);
}
}
else
{
for (int i = 0; i < dst_h; i++)
{
memmove(dst, src, dst_pitch);
src += src_surface->l_pitch;
dst += This->l_pitch;
}
}
}
else
{
for (int i = 0; i < dst_h; i++)
{
memcpy(dst, src, dst_pitch);
src += src_surface->l_pitch;
dst += This->l_pitch;
}
} }
} }
} }