feat(client): Distinguish clients based on patch identification

Caball009 · Caball009 · commit c4e3f1d4419a · 2025-11-06T14:49:20.000+01:00
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h
@@ -68,6 +68,10 @@ extern const Color chatSystemColor;
 extern const Color chatSystemColor;
 extern const Color acceptTrueColor;
 extern const Color acceptFalseColor;
+extern const Color gameColorPatchVersion;
+extern const Color gameInProgressColorPatchVersion;
+extern const Color playerColorPatchVersion;
+extern const Color playerGrayedColorPatchVersion;
 
 
 void lanUpdateSlotList( void );
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp
@@ -36,6 +36,7 @@
 #include "Common/PlayerList.h"
 #include "Common/PlayerTemplate.h"
 #include "Common/Recorder.h"
+#include "Common/version.h"
 #include "GameClient/AnimateWindowManager.h"
 #include "GameClient/Diplomacy.h"
 #include "GameClient/DisconnectMenu.h"
@@ -532,24 +533,28 @@ void PopulateInGameDiplomacyPopup( void )
 			if (staticTextStatus[rowNum])
 			{
 				staticTextStatus[rowNum]->winHide(FALSE);
+
+				Color frontColor = 0;
+				UnicodeString text;
+
 				if (isInGame)
 				{
 					if (isAlive)
 					{
-						staticTextStatus[rowNum]->winSetEnabledTextColors( aliveColor, backColor );
-						GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerAlive"));
+						frontColor = aliveColor;
+						text = TheGameText->fetch("GUI:PlayerAlive");
 					}
 					else
 					{
 						if (isObserver)
 						{
-							staticTextStatus[rowNum]->winSetEnabledTextColors( observerInGameColor, backColor );
-							GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerObserver"));
+							frontColor = observerInGameColor;
+							text = TheGameText->fetch("GUI:PlayerObserver");
 						}
 						else
 						{
-							staticTextStatus[rowNum]->winSetEnabledTextColors( deadColor, backColor );
-							GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerDead"));
+							frontColor = deadColor;
+							text = TheGameText->fetch("GUI:PlayerDead");
 						}
 					}
 				}
@@ -558,15 +563,22 @@ void PopulateInGameDiplomacyPopup( void )
 					// not in game
 					if (isObserver)
 					{
-						staticTextStatus[rowNum]->winSetEnabledTextColors( observerGoneColor, backColor );
-						GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerObserverGone"));
+						frontColor = observerGoneColor;
+						text = TheGameText->fetch("GUI:PlayerObserverGone");
 					}
 					else
 					{
-						staticTextStatus[rowNum]->winSetEnabledTextColors( goneColor, backColor );
-						GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerGone"));
+						frontColor = goneColor;
+						text = TheGameText->fetch("GUI:PlayerGone");
 					}
 				}
+
+				// TheSuperHackers @feature Caball009 06/11/2025 Set special status for players that are using a patched client version.
+				if (slot->isHuman() && (TheGameInfo->getLocalSlotNum() == slotNum || slot->getPatchVersion() > 0))
+					text.format(L"%s [%s]", text.str(), TheVersion->getUnicodeGitTagOrHash().str());
+
+				staticTextStatus[rowNum]->winSetEnabledTextColors(frontColor, backColor);
+				GadgetStaticTextSetText(staticTextStatus[rowNum], text);
 			}
 
 			slotNumInRow[rowNum++] = slotNum;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp
@@ -423,6 +423,13 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 			}
 			if(slot->isHuman())
 			{
+				if (i == myGame->getLocalSlotNum() || myGame->getSlot(i)->getPatchVersion() > 0)
+				{
+					// TheSuperHackers @feature Caball009 06/11/2025 Set special color for players that are using a patched client version.
+					GadgetComboBoxSetEnabledTextColors(comboPlayer[i], playerColorPatchVersion, GameMakeColor(0, 0, 0, 255));
+					GadgetComboBoxSetDisabledTextColors(comboPlayer[i], playerGrayedColorPatchVersion, GameMakeColor(0, 0, 0, 255));
+				}
+
 				UnicodeString newName = slot->getName();
 				UnicodeString oldName = GadgetComboBoxGetText(comboPlayer[i]);
 				if (comboPlayer[i] && newName.compare(oldName))
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
@@ -52,16 +52,20 @@ extern Bool LANbuttonPushed;
 
 
 //Colors used for the chat dialogs
-const Color playerColor =  GameMakeColor(255,255,255,255);
-const Color gameColor =  GameMakeColor(255,255,255,255);
-const Color gameInProgressColor =  GameMakeColor(128,128,128,255);
-const Color chatNormalColor =  GameMakeColor(50,215,230,255);
-const Color chatActionColor =  GameMakeColor(255,0,255,255);
-const Color chatLocalNormalColor =  GameMakeColor(255,128,0,255);
-const Color chatLocalActionColor =  GameMakeColor(128,255,255,255);
-const Color chatSystemColor =  GameMakeColor(255,255,255,255);
-const Color acceptTrueColor =  GameMakeColor(0,255,0,255);
-const Color acceptFalseColor =  GameMakeColor(255,0,0,255);
+const Color playerColor                     = GameMakeColor(255,255,255,255);
+const Color gameColor                       = GameMakeColor(255,255,255,255);
+const Color gameInProgressColor             = GameMakeColor(128,128,0,255);
+const Color chatNormalColor                 = GameMakeColor(50,215,230,255);
+const Color chatActionColor                 = GameMakeColor(255,0,255,255);
+const Color chatLocalNormalColor            = GameMakeColor(255,128,0,255);
+const Color chatLocalActionColor            = GameMakeColor(128,255,255,255);
+const Color chatSystemColor                 = GameMakeColor(255,255,255,255);
+const Color acceptTrueColor                 = GameMakeColor(0,255,0,255);
+const Color acceptFalseColor                = GameMakeColor(255,0,0,255);
+const Color gameColorPatchVersion           = GameMakeColor(255,255,0,255);
+const Color gameInProgressColorPatchVersion = GameMakeColor(192,192,0,255);
+const Color playerColorPatchVersion         = gameColorPatchVersion;
+const Color playerGrayedColorPatchVersion   = gameInProgressColorPatchVersion;
 
 
 UnicodeString LANAPIInterface::getErrorStringFromReturnType( ReturnType ret )
@@ -640,7 +644,9 @@ void LANAPI::OnPlayerList( LANPlayer *playerList )
 		LANPlayer *player = m_lobbyPlayers;
 		while (player)
 		{
-			Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), playerColor, -1, -1);
+			// TheSuperHackers @feature Caball009 06/11/2025 Set special color for players that are using a patched client version.
+			const Color color = (player->getPatchVersion() > 0 || m_localIP == player->getIP()) ? playerColorPatchVersion : playerColor;
+			const Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), color, -1, -1);
 			GadgetListBoxSetItemData(listboxPlayers, (void *)player->getIP(),addedIndex, 0 );
 
 			if (selectedIP == player->getIP())
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp
@@ -226,7 +226,12 @@ void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList )
 			{
 				txtGName.concat(L"]");
 			}
-			Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, (gameList->isGameInProgress())?gameInProgressColor:gameColor, -1, -1);
+
+			// TheSuperHackers @feature Caball009 06/11/2025 Set special color for games that are using a patched client version.
+			const Color color = (gameList->getSlot(0)->getPatchVersion() > 0)
+				? ((gameList->isGameInProgress()) ? gameInProgressColorPatchVersion : gameColorPatchVersion)
+				: ((gameList->isGameInProgress()) ? gameInProgressColor : gameColor);
+			const Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, color, -1, -1);
 			GadgetListBoxSetItemData(gameListbox, (void *)gameList, addedIndex, 0 );
 
 			if (selectedPtr == gameList)

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@`
`36`	`36`	`#include "Common/PlayerList.h"`
`37`	`37`	`#include "Common/PlayerTemplate.h"`
`38`	`38`	`#include "Common/Recorder.h"`
	`39`	`+#include "Common/version.h"`
`39`	`40`	`#include "GameClient/AnimateWindowManager.h"`
`40`	`41`	`#include "GameClient/Diplomacy.h"`
`41`	`42`	`#include "GameClient/DisconnectMenu.h"`
`@@ -532,24 +533,28 @@ void PopulateInGameDiplomacyPopup( void )`
`532`	`533`	`if (staticTextStatus[rowNum])`
`533`	`534`	`{`
`534`	`535`	`staticTextStatus[rowNum]->winHide(FALSE);`
	`536`	`+`
	`537`	`+ Color frontColor = 0;`
	`538`	`+ UnicodeString text;`
	`539`	`+`
`535`	`540`	`if (isInGame)`
`536`	`541`	`{`
`537`	`542`	`if (isAlive)`
`538`	`543`	`{`
`539`		`- staticTextStatus[rowNum]->winSetEnabledTextColors( aliveColor, backColor );`
`540`		`- GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerAlive"));`
	`544`	`+ frontColor = aliveColor;`
	`545`	`+ text = TheGameText->fetch("GUI:PlayerAlive");`
`541`	`546`	`}`
`542`	`547`	`else`
`543`	`548`	`{`
`544`	`549`	`if (isObserver)`
`545`	`550`	`{`
`546`		`- staticTextStatus[rowNum]->winSetEnabledTextColors( observerInGameColor, backColor );`
`547`		`- GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerObserver"));`
	`551`	`+ frontColor = observerInGameColor;`
	`552`	`+ text = TheGameText->fetch("GUI:PlayerObserver");`
`548`	`553`	`}`
`549`	`554`	`else`
`550`	`555`	`{`
`551`		`- staticTextStatus[rowNum]->winSetEnabledTextColors( deadColor, backColor );`
`552`		`- GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerDead"));`
	`556`	`+ frontColor = deadColor;`
	`557`	`+ text = TheGameText->fetch("GUI:PlayerDead");`
`553`	`558`	`}`
`554`	`559`	`}`
`555`	`560`	`}`
`@@ -558,15 +563,22 @@ void PopulateInGameDiplomacyPopup( void )`
`558`	`563`	`// not in game`
`559`	`564`	`if (isObserver)`
`560`	`565`	`{`
`561`		`- staticTextStatus[rowNum]->winSetEnabledTextColors( observerGoneColor, backColor );`
`562`		`- GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerObserverGone"));`
	`566`	`+ frontColor = observerGoneColor;`
	`567`	`+ text = TheGameText->fetch("GUI:PlayerObserverGone");`
`563`	`568`	`}`
`564`	`569`	`else`
`565`	`570`	`{`
`566`		`- staticTextStatus[rowNum]->winSetEnabledTextColors( goneColor, backColor );`
`567`		`- GadgetStaticTextSetText(staticTextStatus[rowNum], TheGameText->fetch("GUI:PlayerGone"));`
	`571`	`+ frontColor = goneColor;`
	`572`	`+ text = TheGameText->fetch("GUI:PlayerGone");`
`568`	`573`	`}`
`569`	`574`	`}`
	`575`	`+`
	`576`	`+ // TheSuperHackers @feature Caball009 06/11/2025 Set special status for players that are using a patched client version.`
	`577`	`+ if (slot->isHuman() && (TheGameInfo->getLocalSlotNum() == slotNum \|\| slot->getPatchVersion() > 0))`
	`578`	`+ text.format(L"%s [%s]", text.str(), TheVersion->getUnicodeGitTagOrHash().str());`
	`579`	`+`
	`580`	`+ staticTextStatus[rowNum]->winSetEnabledTextColors(frontColor, backColor);`
	`581`	`+ GadgetStaticTextSetText(staticTextStatus[rowNum], text);`
`570`	`582`	`}`
`571`	`583`
`572`	`584`	`slotNumInRow[rowNum++] = slotNum;`
Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,13 @@ void UpdateSlotList( GameInfo myGame, GameWindow comboPlayer[],`
`423`	`423`	`}`
`424`	`424`	`if(slot->isHuman())`
`425`	`425`	`{`
	`426`	`+ if (i == myGame->getLocalSlotNum() \|\| myGame->getSlot(i)->getPatchVersion() > 0)`
	`427`	`+ {`
	`428`	`+ // TheSuperHackers @feature Caball009 06/11/2025 Set special color for players that are using a patched client version.`
	`429`	`+ GadgetComboBoxSetEnabledTextColors(comboPlayer[i], playerColorPatchVersion, GameMakeColor(0, 0, 0, 255));`
	`430`	`+ GadgetComboBoxSetDisabledTextColors(comboPlayer[i], playerGrayedColorPatchVersion, GameMakeColor(0, 0, 0, 255));`
	`431`	`+ }`
	`432`	`+`
`426`	`433`	`UnicodeString newName = slot->getName();`
`427`	`434`	`UnicodeString oldName = GadgetComboBoxGetText(comboPlayer[i]);`
`428`	`435`	`if (comboPlayer[i] && newName.compare(oldName))`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,12 @@ void LANDisplayGameList( GameWindow gameListbox, LANGameInfo gameList )`
`226`	`226`	`{`
`227`	`227`	`txtGName.concat(L"]");`
`228`	`228`	`}`
`229`		`- Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, (gameList->isGameInProgress())?gameInProgressColor:gameColor, -1, -1);`
	`229`	`+`
	`230`	`+ // TheSuperHackers @feature Caball009 06/11/2025 Set special color for games that are using a patched client version.`
	`231`	`+ const Color color = (gameList->getSlot(0)->getPatchVersion() > 0)`
	`232`	`+ ? ((gameList->isGameInProgress()) ? gameInProgressColorPatchVersion : gameColorPatchVersion)`
	`233`	`+ : ((gameList->isGameInProgress()) ? gameInProgressColor : gameColor);`
	`234`	`+ const Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, color, -1, -1);`
`230`	`235`	`GadgetListBoxSetItemData(gameListbox, (void *)gameList, addedIndex, 0 );`
`231`	`236`
`232`	`237`	`if (selectedPtr == gameList)`