[Hgengine-cvs] SF.net SVN: hgengine:[736] Mercury2/src/Win32Window.cpp

[<axl...@us...>]

Revision: 736
          http://hgengine.svn.sourceforge.net/hgengine/?rev=736&view=rev
Author:   axlecrusher
Date:     2010-05-18 19:58:51 +0000 (Tue, 18 May 2010)

Log Message:
-----------
fix warnings

Modified Paths:
--------------
    Mercury2/src/Win32Window.cpp

Modified: Mercury2/src/Win32Window.cpp
===================================================================
--- Mercury2/src/Win32Window.cpp	2010-05-18 19:58:20 UTC (rev 735)
+++ Mercury2/src/Win32Window.cpp	2010-05-18 19:58:51 UTC (rev 736)
@@ -244,9 +244,9 @@
 					GetWindowRect(m_hwnd, &rect);
 					GetCursorPos(&pos);
 					ScreenToClient(m_hwnd, &pos );
-					bool left = message.wParam&MK_LBUTTON;
-					bool right = message.wParam&MK_RBUTTON;
-					bool center = message.wParam&MK_MBUTTON;
+					bool left = GetBit(message.wParam,MK_LBUTTON);
+					bool right = GetBit(message.wParam,MK_RBUTTON);
+					bool center = GetBit(message.wParam,MK_MBUTTON);
 					bool su = 0;
 					bool sd = 0;
 					int px = pos.x;// - rect.left - borderx;
@@ -295,16 +295,16 @@
 			case WM_RBUTTONUP:
 			case WM_MBUTTONDOWN:
 			case WM_MBUTTONUP:
-				MouseInput::ProcessMouseInput( lastx, lasty, message.wParam&MK_LBUTTON, 
-					message.wParam&MK_RBUTTON, message.wParam&MK_MBUTTON, 0, 0, false);
+				MouseInput::ProcessMouseInput( lastx, lasty, GetBit(message.wParam,MK_LBUTTON), 
+					GetBit(message.wParam,MK_RBUTTON), GetBit(message.wParam,MK_MBUTTON), 0, 0, false);
 				break;
 			case 0x020A: //Not-too-well-documented mouse wheel.
 			{
 				short cx = short(message.wParam>>16);
-				MouseInput::ProcessMouseInput( lastx, lasty, message.wParam&MK_LBUTTON, 
-					message.wParam&MK_RBUTTON, message.wParam&MK_MBUTTON, (cx>0), (cx<0), false);
-				MouseInput::ProcessMouseInput( lastx, lasty, message.wParam&MK_LBUTTON, 
-					message.wParam&MK_RBUTTON, message.wParam&MK_MBUTTON, 0, 0, false);
+				MouseInput::ProcessMouseInput( lastx, lasty, GetBit(message.wParam,MK_LBUTTON), 
+					GetBit(message.wParam,MK_RBUTTON), GetBit(message.wParam,MK_MBUTTON), (cx>0), (cx<0), false);
+				MouseInput::ProcessMouseInput( lastx, lasty, GetBit(message.wParam,MK_LBUTTON), 
+					GetBit(message.wParam,MK_RBUTTON), GetBit(message.wParam,MK_MBUTTON), 0, 0, false);
 				break;
 			}
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.