hooked up motd and tooltips

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NGMP_types.h

@@ -17,7 +17,9 @@ enum ENetworkMeshType : uint8_t
 class NetworkMemberBase
 {
 public:
-	AsciiString m_strName = "NO_NAME";
+	int64_t user_id = -1;
+	std::string display_name;
+
 	ENetworkConnectionState m_connectionState = ENetworkConnectionState::NOT_CONNECTED;
 	bool m_bIsHost = false;
 

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NetworkMesh.h

@@ -92,6 +92,16 @@ class NetworkMesh
 		return m_mapConnections;
 	}
 
+	PlayerConnection* GetConnectionForUser(int64_t user_id)
+	{
+		if (m_mapConnections.contains(user_id))
+		{
+			return &m_mapConnections[user_id];
+		}
+
+		return nullptr;
+	}
+
 private:
 	PlayerConnection* GetConnectionForPeer(ENetPeer* peer)
 	{

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_Init.h

@@ -165,6 +165,11 @@ class NGMP_OnlineServicesManager
 		return m_vecRooms;
 	}
 
+	void ProcessMOTD(const char* szMOTD)
+	{
+		m_strMOTD = std::string(szMOTD);
+	}
+
 	std::function<void(NGMP_ENATType previousNATType, NGMP_ENATType newNATType)> m_cbNATTypeChanged = nullptr;
 	void RegisterForNATTypeChanges(std::function<void(NGMP_ENATType previousNATType, NGMP_ENATType newNATType)> cbNATTypeChanged) { m_cbNATTypeChanged = cbNATTypeChanged; }
 
@@ -201,6 +206,8 @@ class NGMP_OnlineServicesManager
 		return AsciiString("Undetermined");
 	}
 
+	std::string& GetMOTD() { return m_strMOTD; }
+
 private:
 	//EOS_HPlatform m_EOSPlatformHandle = nullptr;
 
@@ -225,4 +232,6 @@ class NGMP_OnlineServicesManager
 	int64_t m_timeBetweenUserPuts = 60000;
 
 	WebSocket* m_pWebSocket = nullptr;
+
+	std::string m_strMOTD;
 };

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h

@@ -7,8 +7,6 @@
 
 struct LobbyMemberEntry : public NetworkMemberBase
 {
-	int64_t user_id = -1;
-	std::string display_name;
 
 	std::string strIPAddress;
 	uint16_t preferredPort;

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.h

@@ -41,7 +41,19 @@ class NGMP_OnlineServices_RoomsInterface
 		m_RosterNeedsRefreshCallback = cb;
 	}
 
-	NetworkRoomMember* GetRoomMemberFromID(uint64_t puid)
+	NetworkRoomMember* GetRoomMemberFromIndex(int index)
+	{
+		if (m_mapMembers.size() > index)
+		{
+			auto it = m_mapMembers.begin();
+			std::advance(it, index);
+			return &it->second;
+		}
+
+		return nullptr;
+	}
+
+	NetworkRoomMember* GetRoomMemberFromID(int64_t puid)
 	{
 		if (m_mapMembers.contains(puid))
 		{
@@ -78,7 +90,7 @@ class NGMP_OnlineServices_RoomsInterface
 		}
 	}
 
-	void OnRosterUpdated(std::vector<std::string> vecUsers);
+	void OnRosterUpdated(std::vector<std::string> vecUsers, std::vector<int64_t> vecIDs);
 
 	int GetCurrentRoomID() const { return m_CurrentRoomID; }
 

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

@@ -67,6 +67,7 @@
 
 #include "GameNetwork/GeneralsOnline/NGMP_interfaces.h"
 #include <ws2ipdef.h>
+#include <format>
 NGMPGame* TheNGMPGame = NULL;
 
 void WOLDisplaySlotList( void );
@@ -1109,9 +1110,26 @@ void WOLDisplaySlotList( void )
 		{
 			if (i == game->getLocalSlotNum())
 			{
-				// set up my own ping...
-				slot->setPingString("TODO_NGMP");
-				//slot->setPingString(TheGameSpyInfo->getPingString());
+				LobbyMemberEntry member = NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetRoomMemberFromID(slot->m_userID);
+				PlayerConnection* pConnection = NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetNetworkMesh()->GetConnectionForUser(slot->m_userID);
+
+				std::string strPingString = "";
+				std::string strConnectionState = "Not Connected";
+				int latency = -1;
+				if (pConnection != nullptr)
+				{
+					strConnectionState = "Connected";
+					latency = pConnection->latency;
+					
+				}
+				
+				strPingString = std::format("Display Name: {}\nUser ID: {}\nConnection Type: {}\nLatency: {}",
+					member.display_name.c_str(),
+					member.user_id,
+					strConnectionState.c_str(),
+					latency);
+
+				slot->setPingString(strPingString.c_str());
 			}
 
 			if (genericPingWindow[i])

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

@@ -234,8 +234,6 @@ static void playerTooltip(GameWindow *window,
 													UnsignedInt mouse)
 {
 	// TODO_NGMP: Support all of this again
-	TheMouse->setCursorTooltip(UnicodeString(L"TODO_NGMP"), -1, NULL, 1.5f); // the text and width are the only params used.  the others are the default values.
-	return;
 
 	Int x, y, row, col;
 	x = LOLONGTOSHORT(mouse);
@@ -245,14 +243,40 @@ static void playerTooltip(GameWindow *window,
 
 	if (row == -1 || col == -1)
 	{
-		TheMouse->setCursorTooltip( UnicodeString::TheEmptyString);//TheGameText->fetch("TOOLTIP:PlayersInLobby") );
+		TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);//TheGameText->fetch("TOOLTIP:PlayersInLobby") );
 		return;
 	}
 
 	UnicodeString uName = GadgetListBoxGetText(window, row, COLUMN_PLAYERNAME);
 	AsciiString aName;
 	aName.translate(uName);
 
+	NetworkRoomMember* pRoomMember = NGMP_OnlineServicesManager::GetInstance()->GetRoomsInterface()->GetRoomMemberFromIndex(row);
+
+	if (col > 0)
+	{
+		if (pRoomMember != nullptr)
+		{
+			std::string strTooltip = std::format("Display Name: {}\nUser ID: {}", pRoomMember->display_name.c_str(), pRoomMember->user_id);
+
+			UnicodeString ucTooltip;
+			ucTooltip.translate(strTooltip.c_str());
+
+			TheMouse->setCursorTooltip(ucTooltip, -1, NULL, 1.5f); // the text and width are the only params used.  the others are the default values.
+		}
+		else
+		{
+			TheMouse->setCursorTooltip(UnicodeString(L"Error: 1"), -1, NULL, 1.5f); // the text and width are the only params used.  the others are the default values.
+		}
+		
+
+
+	}
+
+
+	return;
+
+
 	PlayerInfoMap::iterator it = TheGameSpyInfo->getPlayerInfoMap()->find(aName);
 	PlayerInfo *info = &(it->second);
 	Bool isLocalPlayer = (TheGameSpyInfo->getLocalName().compareNoCase(info->m_name) == 0);
@@ -524,7 +548,7 @@ void PopulateLobbyPlayerListbox(void)
 
 		// TODO_NGMP: fill out more
 		PlayerInfo pi;
-		pi.m_name = netRoomMember.m_strName;
+		pi.m_name = AsciiString(netRoomMember.display_name.c_str());
 
 		// NGMP: Color by connection state
 

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

@@ -252,7 +252,7 @@ static void updateNumPlayersOnline(void)
 		UnicodeString line;
 
 #if defined(GENERALS_ONLINE)
-		AsciiString aMotd = "TODO MOTD GOES HERE";
+		AsciiString aMotd = AsciiString(NGMP_OnlineServicesManager::GetInstance()->GetMOTD().c_str());
 #else
 		AsciiString aMotd = TheGameSpyInfo->getMOTD();
 #endif

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Auth.cpp

@@ -10,6 +10,7 @@
 #include <windows.h>
 #include <wincred.h>
 #include "GameNetwork/GameSpyOverlay.h"
+#include "../json.hpp"
 
 
 #include "GameNetwork/GeneralsOnline/vendor/libcurl/curl.h"
@@ -294,6 +295,13 @@ void NGMP_OnlineServices_AuthInterface::Tick()
 	}
 }
 
+struct MOTDResponse
+{
+	std::string MOTD;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(MOTDResponse, MOTD)
+};
+
 void NGMP_OnlineServices_AuthInterface::OnLoginComplete(bool bSuccess, const char* szWSAddr, const char* szWSToken)
 {
 	if (bSuccess)
@@ -307,14 +315,49 @@ void NGMP_OnlineServices_AuthInterface::OnLoginComplete(bool bSuccess, const cha
 		// NOTE: This is partially blocking and partially async...
 		NGMP_OnlineServicesManager::GetInstance()->GetPortMapper().DetermineLocalNetworkCapabilities([this]()
 			{
-				ClearGSMessageBoxes();
+				// GET MOTD
 
-				for (auto cb : m_vecLogin_PendingCallbacks)
-				{
-					// TODO_NGMP: Support failure
-					cb(true);
-				}
-				m_vecLogin_PendingCallbacks.clear();
+				std::string strURI = NGMP_OnlineServicesManager::GetAPIEndpoint("MOTD", true);
+				std::map<std::string, std::string> mapHeaders;
+				NGMP_OnlineServicesManager::GetInstance()->GetHTTPManager()->SendGETRequest(strURI.c_str(), EIPProtocolVersion::DONT_CARE, mapHeaders, [=](bool bSuccess, int statusCode, std::string strBody)
+					{
+						try
+						{
+							nlohmann::json jsonObject = nlohmann::json::parse(strBody);
+							MOTDResponse motdResp = jsonObject.get<MOTDResponse>();
+							
+
+							NGMP_OnlineServicesManager::GetInstance()->ProcessMOTD(motdResp.MOTD.c_str());
+
+							// go to next screen
+							ClearGSMessageBoxes();
+
+							for (auto cb : m_vecLogin_PendingCallbacks)
+							{
+								// TODO_NGMP: Support failure
+								cb(true);
+							}
+							m_vecLogin_PendingCallbacks.clear();
+
+						}
+						catch (...)
+						{
+							NetworkLog("VERSION CHECK: Failed to parse response");
+
+							// if MOTD was bad, still proceed, its a soft error
+							NGMP_OnlineServicesManager::GetInstance()->ProcessMOTD("Error retrieving MOTD");
+
+							// go to next screen
+							ClearGSMessageBoxes();
+
+							for (auto cb : m_vecLogin_PendingCallbacks)
+							{
+								// TODO_NGMP: Support failure
+								cb(true);
+							}
+							m_vecLogin_PendingCallbacks.clear();
+						}
+					});
 			});
 	}
 	else

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp

@@ -151,9 +151,10 @@ class WebSocketMessage_RoomChatIncoming : public WebSocketMessageBase
 class WebSocketMessage_NetworkRoomMemberListUpdate : public WebSocketMessageBase
 {
 public:
-	std::vector<std::string> users;
+	std::vector<std::string> names;
+	std::vector<int64_t> ids;
 
-	NLOHMANN_DEFINE_TYPE_INTRUSIVE(WebSocketMessage_NetworkRoomMemberListUpdate, users)
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(WebSocketMessage_NetworkRoomMemberListUpdate, names, ids)
 };
 
 void WebSocket::Tick()
@@ -211,7 +212,7 @@ void WebSocket::Tick()
 						case EWebSocketMessageID::NETWORK_ROOM_MEMBER_LIST_UPDATE:
 						{
 							WebSocketMessage_NetworkRoomMemberListUpdate memberList = jsonObject.get<WebSocketMessage_NetworkRoomMemberListUpdate>();
-							NGMP_OnlineServicesManager::GetInstance()->GetRoomsInterface()->OnRosterUpdated(memberList.users);
+							NGMP_OnlineServicesManager::GetInstance()->GetRoomsInterface()->OnRosterUpdated(memberList.names, memberList.ids);
 						}
 						break;
 
@@ -576,17 +577,21 @@ void NGMP_OnlineServices_RoomsInterface::SendChatMessageToCurrentRoom(UnicodeStr
 	NGMP_OnlineServicesManager::GetInstance()->GetWebSocket()->SendData_RoomChatMessage(strChatMsg.str());
 }
 
-void NGMP_OnlineServices_RoomsInterface::OnRosterUpdated(std::vector<std::string> vecUsers)
+void NGMP_OnlineServices_RoomsInterface::OnRosterUpdated(std::vector<std::string> vecNames, std::vector<int64_t> vecIDs)
 {
 	m_mapMembers.clear();
 
-	Int64 i = 0;
-	for (std::string strDisplayName : vecUsers)
+	int index = 0;
+	for (std::string strDisplayName : vecNames)
 	{
+		int64_t id = vecIDs.at(index);
+
 		NetworkRoomMember newMember;
-		newMember.m_strName = AsciiString(strDisplayName.c_str());
-		m_mapMembers.emplace(i, newMember);
-			++i;
+		newMember.display_name = strDisplayName;
+		newMember.user_id = id;
+		m_mapMembers.emplace(id, newMember);
+		
+		++index;
 	}
 
 	if (m_RosterNeedsRefreshCallback != nullptr)