[GEN][ZH] Fix double-press group selection logic not reselecting deselected groups

Stubbjax · Stubbjax · commit ec3ed94488b4 · 2025-08-01T12:19:11.000+10:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -1024,10 +1024,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					m_lastGroupSelTime = now;
 				}
 
+				Bool performSelection = TRUE;
+
 				// check for double-press to jump view
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
+					performSelection = FALSE;
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1039,12 +1042,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 							if (numObjs > 0)
 							{
 								// if theres someone in the group, center the camera on them.
-								TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );
+								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
+								TheTacticalView->lookAt( drawable->getPosition() );
+								performSelection = !TheInGameUI->isDrawableSelected( drawable->getID() );
 							}
 						}
 					}
 				} 
-				else 
+
+				if ( performSelection )
 				{
 					TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp
@@ -1099,10 +1099,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 					m_lastGroupSelTime = now;
 				}
 
+				Bool performSelection = TRUE;
+
 				// check for double-press to jump view
 				if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )
 				{
 					DEBUG_LOG(("META: DOUBLETAP select team %d",group));
+					performSelection = FALSE;
 					Player *player = ThePlayerList->getLocalPlayer();
 					if (player)
 					{
@@ -1114,12 +1117,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 							if (numObjs > 0)
 							{
 								// if theres someone in the group, center the camera on them.
-								TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );
+								Drawable* drawable = objlist[numObjs - 1]->getDrawable();
+								TheTacticalView->lookAt( drawable->getPosition() );
+								performSelection = !TheInGameUI->isDrawableSelected( drawable->getID() );
 							}
 						}
 					}
 				} 
-				else 
+				
+				if ( performSelection )
 				{
 					TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!
 

Original file line number	Diff line number	Diff line change
`@@ -1024,10 +1024,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1024`	`1024`	`m_lastGroupSelTime = now;`
`1025`	`1025`	`}`
`1026`	`1026`
	`1027`	`+ Bool performSelection = TRUE;`
	`1028`	`+`
`1027`	`1029`	`// check for double-press to jump view`
`1028`	`1030`	`if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
`1029`	`1031`	`{`
`1030`	`1032`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
	`1033`	`+ performSelection = FALSE;`
`1031`	`1034`	`Player *player = ThePlayerList->getLocalPlayer();`
`1032`	`1035`	`if (player)`
`1033`	`1036`	`{`
`@@ -1039,12 +1042,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1039`	`1042`	`if (numObjs > 0)`
`1040`	`1043`	`{`
`1041`	`1044`	`// if theres someone in the group, center the camera on them.`
`1042`		`- TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );`
	`1045`	`+ Drawable* drawable = objlist[numObjs - 1]->getDrawable();`
	`1046`	`+ TheTacticalView->lookAt( drawable->getPosition() );`
	`1047`	`+ performSelection = !TheInGameUI->isDrawableSelected( drawable->getID() );`
`1043`	`1048`	`}`
`1044`	`1049`	`}`
`1045`	`1050`	`}`
`1046`	`1051`	`}`
`1047`		`- else`
	`1052`	`+`
	`1053`	`+ if ( performSelection )`
`1048`	`1054`	`{`
`1049`	`1055`	`TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!`
`1050`	`1056`
Original file line number	Diff line number	Diff line change
`@@ -1099,10 +1099,13 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1099`	`1099`	`m_lastGroupSelTime = now;`
`1100`	`1100`	`}`
`1101`	`1101`
	`1102`	`+ Bool performSelection = TRUE;`
	`1103`	`+`
`1102`	`1104`	`// check for double-press to jump view`
`1103`	`1105`	`if ( now - m_lastGroupSelTime < 20 && group == m_lastGroupSelGroup )`
`1104`	`1106`	`{`
`1105`	`1107`	`DEBUG_LOG(("META: DOUBLETAP select team %d",group));`
	`1108`	`+ performSelection = FALSE;`
`1106`	`1109`	`Player *player = ThePlayerList->getLocalPlayer();`
`1107`	`1110`	`if (player)`
`1108`	`1111`	`{`
`@@ -1114,12 +1117,15 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa`
`1114`	`1117`	`if (numObjs > 0)`
`1115`	`1118`	`{`
`1116`	`1119`	`// if theres someone in the group, center the camera on them.`
`1117`		`- TheTacticalView->lookAt( objlist[numObjs-1]->getDrawable()->getPosition() );`
	`1120`	`+ Drawable* drawable = objlist[numObjs - 1]->getDrawable();`
	`1121`	`+ TheTacticalView->lookAt( drawable->getPosition() );`
	`1122`	`+ performSelection = !TheInGameUI->isDrawableSelected( drawable->getID() );`
`1118`	`1123`	`}`
`1119`	`1124`	`}`
`1120`	`1125`	`}`
`1121`	`1126`	`}`
`1122`		`- else`
	`1127`	`+`
	`1128`	`+ if ( performSelection )`
`1123`	`1129`	`{`
`1124`	`1130`	`TheInGameUI->deselectAllDrawables( false ); //No need to post message because we're just creating a new group!`
`1125`	`1131`