Stop ASSERT when 'mouse entering Apple screen area' (#464)

This commit is contained in:
tomcw 2017-10-10 22:11:36 +01:00
parent b1dfd57502
commit 03b4e889e5

View File

@ -2699,8 +2699,11 @@ static void FrameSetCursorPosByMousePos(int x, int y, int dx, int dy, bool bLeav
else // Mouse entering Apple screen area else // Mouse entering Apple screen area
{ {
// sprintf(szDbg, "[MOUSE_ENTERING] x=%d, y=%d\n", x, y); OutputDebugString(szDbg); // sprintf(szDbg, "[MOUSE_ENTERING] x=%d, y=%d\n", x, y); OutputDebugString(szDbg);
x -= (viewportx+2-MAGICX); if (x < 0) x = 0; if (!g_bIsFullScreen) // GH#464
y -= (viewporty+2-MAGICY); if (y < 0) y = 0; {
x -= (viewportx+2-MAGICX); if (x < 0) x = 0;
y -= (viewporty+2-MAGICY); if (y < 0) y = 0;
}
_ASSERT(x <= g_nViewportCX); _ASSERT(x <= g_nViewportCX);
_ASSERT(y <= g_nViewportCY); _ASSERT(y <= g_nViewportCY);