Major implementation refactor.

Author: Caball009

GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h

@@ -282,6 +282,7 @@ class LANAPI : public LANAPIInterface
 	void handleGameStartTimer( LANMessage *msg, UnsignedInt senderIP );
 	void handleGameOptions( LANMessage *msg, UnsignedInt senderIP );
 	void handleInActive( LANMessage *msg, UnsignedInt senderIP );
+	void handlePatchVersion( LANMessage *msg, UnsignedInt senderIP );
 
 };
 
@@ -319,6 +320,7 @@ struct LANMessage
 		MSG_INACTIVE,						///< I've alt-tabbed out.  Unaccept me cause I'm a poo-flinging monkey.
 
 		MSG_REQUEST_GAME_INFO,	///< For direct connect, get the game info from a specific IP Address
+		MSG_PATCH_VERSION,      ///< TheSuperHackers patch version
 
 		MSG_MAX
 	} LANMessageType;
@@ -366,7 +368,6 @@ struct LANMessage
 			UnsignedInt exeCRC;
 			UnsignedInt iniCRC;
 			char serial[g_maxSerialLength];
-			UnsignedInt patchVersion;
 		} GameToJoin;
 
 		// GameJoined is sent with JOIN_ACCEPT
@@ -416,6 +417,11 @@ struct LANMessage
 			char options[m_lanMaxOptionsLength+1];
 		} GameOptions;
 
+		struct
+		{
+			UnsignedInt patchVersion;
+		} PatchInfo;
+
 	};
 };
 #pragma pack(pop)

GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h

@@ -39,7 +39,7 @@
 class LANPlayer
 {
 public:
-	LANPlayer() { m_name = m_login = m_host = L""; m_lastHeard = 0; m_next = NULL; m_IP = 0; }
+	LANPlayer() { m_name = m_login = m_host = L""; m_lastHeard = 0; m_next = NULL; m_IP = 0; m_patchVersion = 0; }
 
 	// Access functions
 	inline UnicodeString getName( void ) { return m_name; }
@@ -56,14 +56,17 @@ class LANPlayer
 	inline void setNext( LANPlayer *next ) { m_next = next; }
 	inline UnsignedInt getIP( void ) { return m_IP; }
 	inline void setIP( UnsignedInt IP ) { m_IP = IP; }
+	inline void setPatchVersion(UnsignedInt patchVersion) { m_patchVersion = patchVersion; }
+	inline UnsignedInt getPatchVersion() const { return m_patchVersion; }
 
 protected:
-	UnicodeString m_name;			///< Player name
-	UnicodeString m_login;		///< login name
-	UnicodeString m_host;			///< machine name
-	UnsignedInt m_lastHeard;	///< The last time we heard from this player (for timeout purposes)
-	LANPlayer *m_next;				///< Linked list pointer
-	UnsignedInt m_IP;					///< Player's IP
+	UnicodeString m_name;       ///< Player name
+	UnicodeString m_login;      ///< login name
+	UnicodeString m_host;       ///< machine name
+	UnsignedInt m_lastHeard;    ///< The last time we heard from this player (for timeout purposes)
+	LANPlayer *m_next;          ///< Linked list pointer
+	UnsignedInt m_IP;           ///< Player's IP
+	UnsignedInt m_patchVersion; ///< TheSuperHackers patch version
 };
 
 #endif //_LANPLAYER_H_

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Diplomacy.cpp

@@ -572,7 +572,7 @@ void PopulateInGameDiplomacyPopup( void )
 					}
 				}
 
-				if (slot->isHuman() && (TheGameInfo->getLocalSlotNum() == slotNum || slot->getPatchVersion() >= 1337))
+				if (slot->isHuman() && (TheGameInfo->getLocalSlotNum() == slotNum || slot->getPatchVersion() > 0))
 					text.concat(L"[SH]");
 
 				staticTextStatus[rowNum]->winSetEnabledTextColors(frontColor, backColor);

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp

@@ -177,7 +177,7 @@ void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName)
 		}
 		else if(slot->isHuman())
 		{
-			addedRow = GadgetListBoxAddEntryText(listBoxPlayers, slot->getName(), (slot->getPatchVersion() >= 1337) ? 0xFFFFFF00 : playerColor, -1, 1);
+			addedRow = GadgetListBoxAddEntryText(listBoxPlayers, slot->getName(),playerColor,-1,1);
 		}
 		Int playerTemplate = slot->getPlayerTemplate();
 		if(playerTemplate == PLAYERTEMPLATE_OBSERVER)

GeneralsMD/Code/GameEngine/Source/GameNetwork/GUIUtil.cpp

@@ -423,7 +423,7 @@ void UpdateSlotList( GameInfo *myGame, GameWindow *comboPlayer[],
 			}
 			if(slot->isHuman())
 			{
-				if (i == myGame->getLocalSlotNum() || myGame->getSlot(i)->getPatchVersion() >= 1337)
+				if (i == myGame->getLocalSlotNum() || myGame->getSlot(i)->getPatchVersion() > 0)
 				{
 					GadgetComboBoxSetEnabledTextColors(comboPlayer[i], 0xFFFFFF00, 0xFF000000);
 					GadgetComboBoxSetDisabledTextColors(comboPlayer[i], 0xFFC0C000, 0xFF000000);

GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp

@@ -922,21 +922,8 @@ AsciiString GameInfoToAsciiString( const GameInfo *game )
 		DEBUG_LOG(("Map name is %s", mapName.str()));
 	}
 
-	UnsignedByte patchedClients = 0;
-	{
-		for (Int i = 0; i < MAX_SLOTS; ++i)
-		{
-			const GameSlot* slot = game->getConstSlot(i);
-			if (slot && slot->isHuman() && (i == game->getLocalSlotNum() || slot->getPatchVersion() >= 1337))
-				patchedClients |= (1 << i);
-		}
-	}
-
-	AsciiString statsString;
-	statsString.format("%d P%cP", game->getUseStats() & 1, patchedClients);
-
 	AsciiString optionsString;
-	optionsString.format("US=%s;M=%2.2x%s;MC=%X;MS=%d;SD=%d;C=%d;SR=%u;SC=%u;O=%c;", statsString.str(), game->getMapContentsMask(), newMapName.str(),
+	optionsString.format("US=%d;M=%2.2x%s;MC=%X;MS=%d;SD=%d;C=%d;SR=%u;SC=%u;O=%c;", game->getUseStats(), game->getMapContentsMask(), newMapName.str(),
 		game->getMapCRC(), game->getMapSize(), game->getSeed(), game->getCRCInterval(), game->getSuperweaponRestriction(),
 		game->getStartingCash().countMoney(), game->oldFactionsOnly() ? 'Y' : 'N' );
 
@@ -1031,7 +1018,6 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 	Int useStats = TRUE;
   Money startingCash = TheGlobalData->m_defaultStartingCash;
   UnsignedShort restriction = 0; // Always the default
-	UnsignedByte patchedClients = 0;
 
 	Bool sawMap, sawMapCRC, sawMapSize, sawSeed, sawSlotlist, sawUseStats, sawSuperweaponRestriction, sawStartingCash, sawOldFactions;
 	sawMap = sawMapCRC = sawMapSize = sawSeed = sawSlotlist = sawUseStats = sawSuperweaponRestriction = sawStartingCash = sawOldFactions = FALSE;
@@ -1065,9 +1051,6 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 		{
 			useStats = atoi(val.str());
 			sawUseStats = true;
-
-			if (val.getLength() >= 5 && val.getCharAt(2) == 'P' && val.getCharAt(4) == 'P')
-				patchedClients = val.getCharAt(3);
 		}
 		else
 		if (key.compare("M") == 0)
@@ -1498,8 +1481,8 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 
 		for(Int i = 0; i<MAX_SLOTS; i++)
 		{
-			if (patchedClients & (1 << i))
-				newSlot[i].setPatchVersion(1337);
+			if (game->getConstSlot(i)->getState() == SLOT_PLAYER && newSlot[i].getState() == SLOT_PLAYER)
+				newSlot[i].setPatchVersion(game->getConstSlot(i)->getPatchVersion());
 
 			game->setSlot(i,newSlot[i]);
 		}

GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPI.cpp

@@ -29,6 +29,7 @@
 #include "Common/crc.h"
 #include "Common/GameState.h"
 #include "Common/Registry.h"
+#include "Common/version.h"
 #include "GameNetwork/LANAPI.h"
 #include "GameNetwork/networkutil.h"
 #include "Common/GlobalData.h"
@@ -417,6 +418,9 @@ void LANAPI::update( void )
 			case LANMessage::MSG_INACTIVE:		// someone is telling us that we're inactive.
 				handleInActive( msg, senderIP );
 				break;
+			case LANMessage::MSG_PATCH_VERSION:		// someone is sharing their patch version with us
+				handlePatchVersion( msg, senderIP );
+				break;
 
 			default:
 				DEBUG_LOG(("Unknown LAN message type %d", msg->LANMessageType));
@@ -461,6 +465,14 @@ void LANAPI::update( void )
 		}
 	}
 
+	if (m_inLobby || (m_currentGame && !m_currentGame->isGameInProgress())) {
+		LANMessage msg;
+		fillInLANMessage(&msg);
+		msg.LANMessageType = LANMessage::MSG_PATCH_VERSION;
+		msg.PatchInfo.patchVersion = TheVersion->getVersionNumber();
+		sendMessage(&msg);
+	}
+
 	Bool playerListChanged = false;
 	Bool gameListChanged = false;
 
@@ -635,7 +647,6 @@ void LANAPI::RequestGameJoin( LANGameInfo *game, UnsignedInt ip /* = 0 */ )
 	GetStringFromRegistry("\\ergc", "", s);
 	strncpy(msg.GameToJoin.serial, s.str(), g_maxSerialLength);
 	msg.GameToJoin.serial[g_maxSerialLength-1] = '\0';
-	msg.GameToJoin.patchVersion = 1337;
 
 	sendMessage(&msg, ip);
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp

@@ -642,7 +642,8 @@ void LANAPI::OnPlayerList( LANPlayer *playerList )
 		LANPlayer *player = m_lobbyPlayers;
 		while (player)
 		{
-			Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), playerColor, -1, -1);
+			const Color color = (player->getPatchVersion() > 0 || m_localIP == player->getIP()) ? 0xFFFFFF00 : playerColor;
+			Int addedIndex = GadgetListBoxAddEntryText(listboxPlayers, player->getName(), color, -1, -1);
 			GadgetListBoxSetItemData(listboxPlayers, (void *)player->getIP(),addedIndex, 0 );
 
 			if (selectedIP == player->getIP())

GeneralsMD/Code/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp

@@ -348,8 +348,6 @@ void LANAPI::handleRequestJoin( LANMessage *msg, UnsignedInt senderIP )
 						newSlot.setPort(NETWORK_BASE_PORT_NUMBER);
 						newSlot.setLastHeard(timeGetTime());
 						newSlot.setSerial(msg->GameToJoin.serial);
-						if (msg->GameToJoin.patchVersion == 1337)
-							newSlot.setPatchVersion(msg->GameToJoin.patchVersion);
 						m_currentGame->setSlot(player,newSlot);
 						DEBUG_LOG(("LANAPI::handleRequestJoin - added player %ls at ip 0x%08x to the game", msg->name, senderIP));
 
@@ -684,3 +682,58 @@ void LANAPI::handleInActive(LANMessage *msg, UnsignedInt senderIP) {
 	RequestGameOptions(options, FALSE);
 	lanUpdateSlotList();
 }
+
+void LANAPI::handlePatchVersion(LANMessage* msg, UnsignedInt senderIP)
+{
+	if (m_inLobby)
+	{
+		LANPlayer *player = m_lobbyPlayers;
+		while (player)
+		{
+			if (player->getIP() == senderIP)
+			{
+				if (!player->getPatchVersion() && msg->PatchInfo.patchVersion > 0)
+				{
+					player->setPatchVersion(msg->PatchInfo.patchVersion);
+					OnPlayerList(m_lobbyPlayers);
+				}
+				break;
+			}
+
+			player = player->getNext();
+		}
+
+		LANGameInfo* game = m_games;
+		while (game)
+		{
+			GameSlot *slot = game->getSlot(0);
+			if (slot->getIP() == senderIP)
+			{
+				DEBUG_ASSERTCRASH(game->getHostIP() == slot->getIP(), ("First game slot is not used by the host"));
+
+				if (!slot->getPatchVersion() && msg->PatchInfo.patchVersion > 0)
+				{
+					slot->setPatchVersion(msg->PatchInfo.patchVersion);
+					OnGameList(m_games);
+				}
+				break;
+			}
+
+			game = game->getNext();
+		}
+	}
+	else if (m_currentGame && !m_currentGame->isGameInProgress())
+	{
+		for (int player = 0; player < MAX_SLOTS; ++player)
+		{
+			if (m_currentGame->getIP(player) == senderIP)
+			{
+				if (!m_currentGame->getSlot(player)->getPatchVersion() && msg->PatchInfo.patchVersion > 0)
+				{
+					m_currentGame->getSlot(player)->setPatchVersion(msg->PatchInfo.patchVersion);
+				}
+				break;
+			}
+		}
+	}
+}

GeneralsMD/Code/GameEngine/Source/GameNetwork/LANGameInfo.cpp

@@ -226,7 +226,10 @@ void LANDisplayGameList( GameWindow *gameListbox, LANGameInfo *gameList )
 			{
 				txtGName.concat(L"]");
 			}
-			Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, (gameList->isGameInProgress())?gameInProgressColor:gameColor, -1, -1);
+			const Color color = (gameList->getSlot(0)->getPatchVersion() > 0)
+				? ((gameList->isGameInProgress()) ? 0xFF808000 : 0xFFFFFF00)
+				: ((gameList->isGameInProgress()) ? gameInProgressColor : gameColor);
+			Int addedIndex = GadgetListBoxAddEntryText(gameListbox, txtGName, color, -1, -1);
 			GadgetListBoxSetItemData(gameListbox, (void *)gameList, addedIndex, 0 );
 
 			if (selectedPtr == gameList)