bugfix(input): Use time-based double tap for unit group centering (TheSuperHackers#2545)

bobtista · web-flow · commit 73394e5babb6 · 2026-04-11T11:29:49.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -1001,7 +1001,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			{
 				DEBUG_LOG(("META: select team %d",group));
 
-				UnsignedInt now = TheGameLogic->getFrame();
+				UnsignedInt now = timeGetTime();
 				if ( m_lastGroupSelTime == 0 )
 				{
 					m_lastGroupSelTime = now;
@@ -1010,7 +1010,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				Bool performSelection = TRUE;
 
 				// check for double-press to jump view
-				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
+				if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
 					// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press
@@ -1082,15 +1082,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			{
 				DEBUG_LOG(("META: select team %d",group));
 
-				UnsignedInt now = TheGameLogic->getFrame();
+				UnsignedInt now = timeGetTime();
 				if ( m_lastGroupSelTime == 0 )
 				{
 					m_lastGroupSelTime = now;
 				}
 
 				// check for double-press to jump view
 
-				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
+				if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
 					Player *player = ThePlayerList->getLocalPlayer();
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -1076,7 +1076,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			{
 				DEBUG_LOG(("META: select team %d",group));
 
-				UnsignedInt now = TheGameLogic->getFrame();
+				UnsignedInt now = timeGetTime();
 				if ( m_lastGroupSelTime == 0 )
 				{
 					m_lastGroupSelTime = now;
@@ -1085,7 +1085,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 				Bool performSelection = TRUE;
 
 				// check for double-press to jump view
-				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
+				if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
 					// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press
@@ -1157,15 +1157,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			{
 				DEBUG_LOG(("META: select team %d",group));
 
-				UnsignedInt now = TheGameLogic->getFrame();
+				UnsignedInt now = timeGetTime();
 				if ( m_lastGroupSelTime == 0 )
 				{
 					m_lastGroupSelTime = now;
 				}
 
 				// check for double-press to jump view
 
-				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
+				if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
 					Player *player = ThePlayerList->getLocalPlayer();

Original file line number	Diff line number	Diff line change
`@@ -1001,7 +1001,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1001`	`1001`	`{`
`1002`	`1002`	`DEBUG_LOG(("META: select team %d",group));`
`1003`	`1003`
`1004`		`- UnsignedInt now = TheGameLogic->getFrame();`
	`1004`	`+ UnsignedInt now = timeGetTime();`
`1005`	`1005`	`if ( m_lastGroupSelTime == 0 )`
`1006`	`1006`	`{`
`1007`	`1007`	`m_lastGroupSelTime = now;`
`@@ -1010,7 +1010,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1010`	`1010`	`Bool performSelection = TRUE;`
`1011`	`1011`
`1012`	`1012`	`// check for double-press to jump view`
`1013`		`- if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
	`1013`	`+ if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )`
`1014`	`1014`	`{`
`1015`	`1015`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
`1016`	`1016`	`// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press`
`@@ -1082,15 +1082,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1082`	`1082`	`{`
`1083`	`1083`	`DEBUG_LOG(("META: select team %d",group));`
`1084`	`1084`
`1085`		`- UnsignedInt now = TheGameLogic->getFrame();`
	`1085`	`+ UnsignedInt now = timeGetTime();`
`1086`	`1086`	`if ( m_lastGroupSelTime == 0 )`
`1087`	`1087`	`{`
`1088`	`1088`	`m_lastGroupSelTime = now;`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`	`1091`	`// check for double-press to jump view`
`1092`	`1092`
`1093`		`- if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
	`1093`	`+ if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )`
`1094`	`1094`	`{`
`1095`	`1095`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
`1096`	`1096`	`Player *player = ThePlayerList->getLocalPlayer();`
Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1076`	`1076`	`{`
`1077`	`1077`	`DEBUG_LOG(("META: select team %d",group));`
`1078`	`1078`
`1079`		`- UnsignedInt now = TheGameLogic->getFrame();`
	`1079`	`+ UnsignedInt now = timeGetTime();`
`1080`	`1080`	`if ( m_lastGroupSelTime == 0 )`
`1081`	`1081`	`{`
`1082`	`1082`	`m_lastGroupSelTime = now;`
`@@ -1085,7 +1085,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1085`	`1085`	`Bool performSelection = TRUE;`
`1086`	`1086`
`1087`	`1087`	`// check for double-press to jump view`
`1088`		`- if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
	`1088`	`+ if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )`
`1089`	`1089`	`{`
`1090`	`1090`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
`1091`	`1091`	`// TheSuperHackers @bugfix Stubbjax 26/05/2025 Perform selection on double-press`
`@@ -1157,15 +1157,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1157`	`1157`	`{`
`1158`	`1158`	`DEBUG_LOG(("META: select team %d",group));`
`1159`	`1159`
`1160`		`- UnsignedInt now = TheGameLogic->getFrame();`
	`1160`	`+ UnsignedInt now = timeGetTime();`
`1161`	`1161`	`if ( m_lastGroupSelTime == 0 )`
`1162`	`1162`	`{`
`1163`	`1163`	`m_lastGroupSelTime = now;`
`1164`	`1164`	`}`
`1165`	`1165`
`1166`	`1166`	`// check for double-press to jump view`
`1167`	`1167`
`1168`		`- if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
	`1168`	`+ if ( now - m_lastGroupSelTime < TheGlobalData->m_doubleClickTimeMS && group == m_lastGroupSelGroup )`
`1169`	`1169`	`{`
`1170`	`1170`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
`1171`	`1171`	`Player *player = ThePlayerList->getLocalPlayer();`