diff --git a/ddraw.rc b/ddraw.rc index 198e3bb..00c8d00 100644 --- a/ddraw.rc +++ b/ddraw.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO -FILEVERSION 1,1,6,2 -PRODUCTVERSION 1,1,6,2 +FILEVERSION 1,1,6,3 +PRODUCTVERSION 1,1,6,3 { BLOCK "StringFileInfo" { @@ -8,13 +8,13 @@ PRODUCTVERSION 1,1,6,2 { VALUE "CompanyName", "cncnet.org" VALUE "FileDescription", "DirectDraw replacement for C&C95 and Red Alert" - VALUE "FileVersion", "1.1.6.2" + VALUE "FileVersion", "1.1.6.3" VALUE "InternalName", "ddraw" VALUE "LegalCopyright", "Copyright (c) 2010-2018" VALUE "LegalTrademarks", "" VALUE "OriginalFileName", "ddraw.dll" VALUE "ProductName", "DirectDraw replacement for C&C95 and Red Alert" - VALUE "ProductVersion", "1.1.6.2" + VALUE "ProductVersion", "1.1.6.3" VALUE "Comments", "https://cncnet.org" } } diff --git a/src/mouse.c b/src/mouse.c index 5264e45..ba00a60 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -56,7 +56,7 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint) ddraw->cursor.y = pt.y; } - if (ddraw->vhack && ddraw->iscnc1 && ddraw->incutscene) + if (ddraw->vhack && (ddraw->iscnc1 || ddraw->isredalert) && ddraw->incutscene) { int diffx = 0, diffy = 0; diff --git a/src/render_soft.c b/src/render_soft.c index bb5a92c..6770ff9 100644 --- a/src/render_soft.c +++ b/src/render_soft.c @@ -46,8 +46,12 @@ BOOL detect_cutscene() } return FALSE; } + else if (ddraw->iscnc1) + { + return getPixel(CUTSCENE_WIDTH + 1, 0) == 0 || getPixel(CUTSCENE_WIDTH + 5, 1) == 0 ? TRUE : FALSE; + } - return getPixel(CUTSCENE_WIDTH + 1, 0) == 0 || getPixel(CUTSCENE_WIDTH + 5, 1) == 0 ? TRUE : FALSE; + return FALSE; } DWORD WINAPI render_soft_main(void)