unify(network): Merge GameSpy and related code

Author: xezon

Generals/Code/GameEngine/Include/Common/PlayerTemplate.h

@@ -114,6 +114,7 @@ class PlayerTemplate
 	//const Image *getHiliteImage( void ) const;
 	//const Image *getPushedImage( void ) const;
 	const Image *getSideIconImage( void ) const;
+	inline const AsciiString getTooltip() const { return m_tooltip; }
 
 	const ScienceVec& getIntrinsicSciences() const { return m_intrinsicSciences; }
 	Int getIntrinsicSciencePurchasePoints() const { return m_intrinsicSPP; }
@@ -161,6 +162,7 @@ class PlayerTemplate
 	AsciiString				m_specialPowerShortcutWinName;			///< The name of the window we'll be using for the shortcut bar
 	Int								m_specialPowerShortcutButtonCount;	///< The number of buttons located on the shortcut bar
 	AsciiString				m_loadScreenMusic;									///< the load screen music we want to play
+	AsciiString				m_tooltip;								///< The tooltip describing this player template
 	Bool							m_observer;
 	Bool							m_playableSide;
 

Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h

@@ -43,6 +43,9 @@ void RefreshGameInfoListBox( GameWindow *mainWin, GameWindow *win );
 void RefreshGameListBoxes( void );
 void ToggleGameListType( void );
 
+void playerTemplateComboBoxTooltip(GameWindow *wndComboBox, WinInstanceData *instData, UnsignedInt mouse);
+void playerTemplateListBoxTooltip(GameWindow *wndListBox, WinInstanceData *instData, UnsignedInt mouse);
+
 enum GameSortType CPP_11(: Int)
 {
 	GAMESORT_ALPHA_ASCENDING = 0,

Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h

@@ -39,6 +39,7 @@ void CancelPatchCheckCallback( void );
 void StartDownloadingPatches( void );
 void HandleCanceledDownload( Bool resetDropDown = TRUE );
 
+#if RTS_GENERALS
 enum OverallStatsPeriod CPP_11(: Int)
 {
 	STATS_TODAY = 0,
@@ -54,9 +55,14 @@ struct OverallStats
 	Int wins[STATS_MAX];
 	Int losses[STATS_MAX];
 };
+#endif
 
 void CheckOverallStats( void );
+#if RTS_GENERALS
 void HandleOverallStats( const OverallStats& USA, const OverallStats& China, const OverallStats& GLA );
+#else
+void HandleOverallStats( const char* szHTTPStats, unsigned len );
+#endif
 
 void CheckNumPlayersOnline( void );
 void HandleNumPlayersOnline( Int numPlayersOnline );

Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h

@@ -64,7 +64,6 @@ class GameSpyInfo : public GameSpyInfoInterface
 	virtual void setLocalPassword( AsciiString passwd ) { m_localPasswd = passwd;	}
 	virtual void setLocalBaseName( AsciiString name ) { m_localBaseName = name; }
 	virtual AsciiString getLocalBaseName( void ){ return m_localBaseName; }
-
 	virtual void setCachedLocalPlayerStats( PSPlayerStats stats ) {m_cachedLocalPlayerStats = stats;	}
 	virtual PSPlayerStats getCachedLocalPlayerStats( void ){ return m_cachedLocalPlayerStats;	}
 
@@ -177,7 +176,6 @@ class GameSpyInfo : public GameSpyInfoInterface
 	std::set<GameWindow *> m_textWindows;
 
 	std::set<Int> m_preorderPlayers;
-
 	Int m_additionalDisconnects;
 };
 

Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h

@@ -119,6 +119,7 @@ class PeerRequest
 			UnsignedInt iniCRC;
 			UnsignedInt gameVersion;
 			Bool allowObservers;
+      Bool useStats;
 			UnsignedShort ladPort;
 			UnsignedInt ladPassCRC;
 			Bool restrictGameList;
@@ -331,6 +332,7 @@ class PeerResponse
 			Bool isStaging;
 			Bool requiresPassword;
 			Bool allowObservers;
+      Bool useStats;
 			UnsignedInt version;
 			UnsignedInt exeCRC;
 			UnsignedInt iniCRC;

Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h

@@ -47,7 +47,7 @@ class PSPlayerStats
 	Int id;
 	PerGeneralMap wins;
 	PerGeneralMap losses;
-	PerGeneralMap games;
+	PerGeneralMap games;              //first: playerTemplate #,  second: #games played (see also gamesAsRandom)
 	PerGeneralMap duration;
 	PerGeneralMap unitsKilled;
 	PerGeneralMap unitsLost;

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp

@@ -542,10 +542,17 @@ void createGame( void )
 	req.password = passwd.str();
 	CustomMatchPreferences customPref;
 	Bool aO = GadgetCheckBoxIsChecked(checkBoxAllowObservers);
+  Bool limitArmies = FALSE;
+  Bool useStats = TRUE;
 	customPref.setAllowsObserver(aO);
+  customPref.setFactionsLimited( limitArmies );
+  customPref.setUseStats( useStats );
 	customPref.write();
 	req.stagingRoomCreation.allowObservers = aO;
+  req.stagingRoomCreation.useStats = useStats;
 	TheGameSpyGame->setAllowObservers(aO);
+  TheGameSpyGame->setOldFactionsOnly( limitArmies );
+  TheGameSpyGame->setUseStats( useStats );
 	req.stagingRoomCreation.exeCRC = TheGlobalData->m_exeCRC;
 	req.stagingRoomCreation.iniCRC = TheGlobalData->m_iniCRC;
 	req.stagingRoomCreation.gameVersion = TheGameSpyInfo->getInternalIP();

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp

@@ -1173,6 +1173,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
 							room.setExeCRC(resp.stagingRoom.exeCRC);
 							room.setIniCRC(resp.stagingRoom.iniCRC);
 							room.setAllowObservers(resp.stagingRoom.allowObservers);
+              room.setUseStats(resp.stagingRoom.useStats);
 							room.setPingString(resp.stagingServerPingString.c_str());
 							room.setLadderIP(resp.stagingServerLadderIP.c_str());
 							room.setLadderPort(resp.stagingRoom.ladderPort);

Generals/Code/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp

@@ -89,12 +89,20 @@ Color GameSpyColor[GSCOLOR_MAX] =
 	GameMakeColor(128,128,0,255),		// GSCOLOR_GAME
 	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_FULL
 	GameMakeColor(128,128,128,255),	// GSCOLOR_GAME_CRCMISMATCH
+#if RTS_GENERALS
 	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_NORMAL
+#else
+	GameMakeColor(255,255,255,255),	// GSCOLOR_PLAYER_NORMAL
+#endif
 	GameMakeColor(255,  0,255,255),	// GSCOLOR_PLAYER_OWNER
 	GameMakeColor(255,  0,128,255),	// GSCOLOR_PLAYER_BUDDY
 	GameMakeColor(255,  0,  0,255),	// GSCOLOR_PLAYER_SELF
 	GameMakeColor(128,128,128,255),	// GSCOLOR_PLAYER_IGNORED
+#if RTS_GENERALS
 	GameMakeColor(255,0,0,255),			// GSCOLOR_CHAT_NORMAL
+#else
+	GameMakeColor(255,255,255,255),		// GSCOLOR_CHAT_NORMAL
+#endif
 	GameMakeColor(255,128,0,255),		// GSCOLOR_CHAT_EMOTE,
 	GameMakeColor(255,255,0,255),		// GSCOLOR_CHAT_OWNER,
 	GameMakeColor(128,255,0,255),		// GSCOLOR_CHAT_OWNER_EMOTE,
@@ -114,6 +122,8 @@ Color GameSpyColor[GSCOLOR_MAX] =
 
 Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox )
 {
+	static UnicodeString s_prevMsg = UnicodeString::TheEmptyString;  //stop spam before it happens
+
 	RoomType roomType = StagingRoom;
 	if (getCurrentGroupRoom())
 		roomType = GroupRoom;
@@ -126,11 +136,14 @@ Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *pl
 	if (!message.isEmpty())
 	{
 		if (!playerListbox)
-		{
-			// Public message
-			req.message.isAction = isAction;
-			req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
-			TheGameSpyPeerMessageQueue->addRequest(req);
+		{	// Public message
+			if( isAction  ||  message.compare(s_prevMsg) != 0 )  //don't send duplicate messages
+			{
+				req.message.isAction = isAction;
+				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
+				TheGameSpyPeerMessageQueue->addRequest(req);
+				s_prevMsg = message;
+			}
 			return false;
 		}
 
@@ -140,11 +153,14 @@ Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *pl
 		GadgetListBoxGetSelected(playerListbox, (Int *)&selections);
 
 		if (selections[0] == -1)
-		{
-			// Public message
-			req.message.isAction = isAction;
-			req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
-			TheGameSpyPeerMessageQueue->addRequest(req);
+		{	// Public message
+			if( isAction  ||  message.compare(s_prevMsg) != 0 )  //don't send duplicate messages
+			{
+				req.message.isAction = isAction;
+				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEROOM;
+				TheGameSpyPeerMessageQueue->addRequest(req);
+				s_prevMsg = message;
+			}
 			return false;
 		}
 		else
@@ -180,10 +196,11 @@ Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *pl
 				req.peerRequestType = PeerRequest::PEERREQUEST_MESSAGEPLAYER;
 				TheGameSpyPeerMessageQueue->addRequest(req);
 			}
-
+			s_prevMsg = message;
 			return true;
 		}
 	}
+	s_prevMsg = message;
 	return false;
 }
 

Generals/Code/GameEngine/Source/GameNetwork/GameSpy/GSConfig.cpp

@@ -336,7 +336,7 @@ m_qmChannel(0)
 			// German2 is missing some maps because of content.  But, we need the m_qmMaps
 			// to contain same number of strings as the Retail version so that the
 			// QM Bot thinks that they have the same number of maps.
-			#if 1
+			#if RTS_GENERALS
 			m_qmMaps.push_back(mapName);
 			#else
 			const MapMetaData *md = TheMapCache->findMap(mapName);