mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-15 06:04:49 +01:00
improve cursor lock click checks
This commit is contained in:
parent
bdc54afcf0
commit
802a9e2f96
@ -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);
|
||||
}
|
||||
|
||||
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.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)
|
||||
{
|
||||
int x = (DWORD)((GET_X_LPARAM(lParam) - g_ddraw.render.viewport.x) * g_ddraw.mouse.unscale_x);
|
||||
int y = (DWORD)((GET_Y_LPARAM(lParam) - g_ddraw.render.viewport.y) * g_ddraw.mouse.unscale_y);
|
||||
int x = GET_X_LPARAM(lParam);
|
||||
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.y, y);
|
||||
|
Loading…
x
Reference in New Issue
Block a user