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

improve cursor lock click checks

Browse Source
This commit is contained in:
FunkyFr3sh 2024-06-02 02:05:44 +02:00
parent bdc54afcf0
commit 802a9e2f96
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wndproc.c
View File

@ -842,6 +842,9 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
y = (DWORD)((y - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y); y = (DWORD)((y - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y);
} }
x = min(x, g_ddraw.width - 1);
y = min(y, g_ddraw.height - 1);
InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); InterlockedExchange((LONG*)&g_ddraw.cursor.x, x);
InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); InterlockedExchange((LONG*)&g_ddraw.cursor.y, y);
@ -927,8 +930,25 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
{ {
if (!g_config.devmode && !g_mouse_locked) if (!g_config.devmode && !g_mouse_locked)
{ {
int x = (DWORD)((GET_X_LPARAM(lParam) - g_ddraw.render.viewport.x) * g_ddraw.mouse.unscale_x); int x = GET_X_LPARAM(lParam);
int y = (DWORD)((GET_Y_LPARAM(lParam) - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y); int y = GET_Y_LPARAM(lParam);
if (x > g_ddraw.render.viewport.x + g_ddraw.render.viewport.width ||
x < g_ddraw.render.viewport.x ||
y > g_ddraw.render.viewport.y + g_ddraw.render.viewport.height ||
y < g_ddraw.render.viewport.y)
{
x = g_ddraw.width / 2;
y = g_ddraw.height / 2;
}
else
{
x = (DWORD)((x - g_ddraw.render.viewport.x) * g_ddraw.mouse.unscale_x);
y = (DWORD)((y - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y);
}
x = min(x, g_ddraw.width - 1);
y = min(y, g_ddraw.height - 1);
InterlockedExchange((LONG*)&g_ddraw.cursor.x, x); InterlockedExchange((LONG*)&g_ddraw.cursor.x, x);
InterlockedExchange((LONG*)&g_ddraw.cursor.y, y); InterlockedExchange((LONG*)&g_ddraw.cursor.y, y);