Merge branch 'master' into multi-monitor

Conflicts:
	src/CMakeLists.txt
	src/fullscreen.c
This commit is contained in:
Camilla Berglund
2012-09-12 21:42:21 +02:00
8 changed files with 26 additions and 65 deletions
+3 -2
View File
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <malloc.h>
#include <windowsx.h>
//========================================================================
// Hide mouse cursor
@@ -558,8 +559,8 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
int newCursorX, newCursorY;
// Get signed (!) cursor position
newCursorX = (int)((short)LOWORD(lParam));
newCursorY = (int)((short)HIWORD(lParam));
newCursorX = GET_X_LPARAM(lParam);
newCursorY = GET_Y_LPARAM(lParam);
if (newCursorX != window->Win32.oldCursorX ||
newCursorY != window->Win32.oldCursorY)