Fix middle mouse button click detection to use real-time instead of frames

Author: bobtista

Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h

@@ -76,7 +76,7 @@ class LookAtTranslator : public GameMessageTranslator
 	Bool m_isRotating;					// set to true if we are in the act of MMB rotating
 	Bool m_isPitching;					// set to true if we are in the act of ALT pitch rotation
 	Bool m_isChangingFOV;			// set to true if we are in the act of changing the field of view
-	UnsignedInt m_timestamp;				// set when button goes down
+	UnsignedInt m_middleButtonDownTimeMS;				// real-time in milliseconds when middle button goes down
 	DrawableID m_lastPlaneID;
 	ViewLocation m_viewLocation[ MAX_VIEW_LOCS ];
 	ScrollType m_scrollType;

Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -137,7 +137,7 @@ LookAtTranslator::LookAtTranslator() :
 	m_isRotating(false),
 	m_isPitching(false),
 	m_isChangingFOV(false),
-	m_timestamp(0),
+	m_middleButtonDownTimeMS(0),
 	m_lastPlaneID(INVALID_DRAWABLE_ID),
 	m_lastMouseMoveFrame(0),
 	m_scrollType(SCROLL_NONE)
@@ -278,8 +278,8 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			{
 				stopScrolling();
 			}
-			break;
-		}
+		break;
+	}
 
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
@@ -291,7 +291,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			m_anchorAngle = TheTacticalView->getAngle();
 			m_originalAnchor = msg->getArgument( 0 )->pixel;
 			m_currentPos = msg->getArgument( 0 )->pixel;
-			m_timestamp = TheGameClient->getFrame();
+			m_middleButtonDownTimeMS = timeGetTime();
 			break;
 		}
 
@@ -300,7 +300,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		{
 			m_lastMouseMoveFrame = TheGameLogic->getFrame();
 
-			const UnsignedInt CLICK_DURATION = 5;
+			const UnsignedInt CLICK_DURATION_MS = 167;
 			const UnsignedInt PIXEL_OFFSET = 5;
 
 			m_isRotating = false;
@@ -309,7 +309,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			Int dy = m_currentPos.y-m_originalAnchor.y;
 			Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
 			// if middle button is "clicked", reset to "home" orientation
-			if (!didMove && TheGameClient->getFrame() - m_timestamp < CLICK_DURATION)
+			if (!didMove && timeGetTime() - m_middleButtonDownTimeMS < CLICK_DURATION_MS)
 			{
 				TheTacticalView->setAngleAndPitchToDefault();
 				TheTacticalView->setZoomToDefault();

GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h

@@ -76,7 +76,7 @@ class LookAtTranslator : public GameMessageTranslator
 	Bool m_isRotating;					// set to true if we are in the act of MMB rotating
 	Bool m_isPitching;					// set to true if we are in the act of ALT pitch rotation
 	Bool m_isChangingFOV;			// set to true if we are in the act of changing the field of view
-	UnsignedInt m_timestamp;				// set when button goes down
+	UnsignedInt m_middleButtonDownTimeMS;				// real-time in milliseconds when middle button goes down
 	DrawableID m_lastPlaneID;
 	ViewLocation m_viewLocation[ MAX_VIEW_LOCS ];
 	ScrollType m_scrollType;

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -137,7 +137,7 @@ LookAtTranslator::LookAtTranslator() :
 	m_isRotating(false),
 	m_isPitching(false),
 	m_isChangingFOV(false),
-	m_timestamp(0),
+	m_middleButtonDownTimeMS(0),
 	m_lastPlaneID(INVALID_DRAWABLE_ID),
 	m_lastMouseMoveFrame(0),
 	m_scrollType(SCROLL_NONE)
@@ -277,8 +277,8 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			{
 				stopScrolling();
 			}
-			break;
-		}
+		break;
+	}
 
 		//-----------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_MIDDLE_BUTTON_DOWN:
@@ -290,7 +290,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			m_anchorAngle = TheTacticalView->getAngle();
 			m_originalAnchor = msg->getArgument( 0 )->pixel;
 			m_currentPos = msg->getArgument( 0 )->pixel;
-			m_timestamp = TheGameClient->getFrame();
+			m_middleButtonDownTimeMS = timeGetTime();
 			break;
 		}
 
@@ -299,7 +299,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		{
 			m_lastMouseMoveFrame = TheGameLogic->getFrame();
 
-			const UnsignedInt CLICK_DURATION = 5;
+			const UnsignedInt CLICK_DURATION_MS = 167;
 			const UnsignedInt PIXEL_OFFSET = 5;
 
 			m_isRotating = false;
@@ -308,7 +308,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			Int dy = m_currentPos.y-m_originalAnchor.y;
 			Bool didMove = dx>PIXEL_OFFSET || dy>PIXEL_OFFSET;
 			// if middle button is "clicked", reset to "home" orientation
-			if (!didMove && TheGameClient->getFrame() - m_timestamp < CLICK_DURATION)
+			if (!didMove && timeGetTime() - m_middleButtonDownTimeMS < CLICK_DURATION_MS)
 			{
 				TheTacticalView->setAngleAndPitchToDefault();
 				TheTacticalView->setZoomToDefault();