tweak(lan): Hide computer identity in LAN lobby (#1693)

Author: xezon

Core/GameEngine/Include/Common/GameDefines.h

@@ -86,6 +86,14 @@
 #define ENABLE_GUI_HACKS (1)
 #endif
 
+// Tell our computer identity in the LAN lobby. Disable for privacy.
+// Was enabled in the retail game and exposed the computer login and host names.
+#ifdef RTS_DEBUG
+#ifndef TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
+#define TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY (1)
+#endif
+#endif
+
 #define MIN_DISPLAY_BIT_DEPTH       16
 #define DEFAULT_DISPLAY_BIT_DEPTH   32
 #define DEFAULT_DISPLAY_WIDTH      800 // The standard resolution this game was designed for

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

@@ -901,14 +901,22 @@ void updateGameOptions( void )
 void setLANPlayerTooltip(LANPlayer* player)
 {
 	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
+
+	if (!player->getLogin().isEmpty() || !player->getHost().isEmpty())
+	{
+		tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
+	}
+
 #if defined(RTS_DEBUG)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
 	tooltip.concat(ip);
 #endif
-	TheMouse->setCursorTooltip( tooltip );
 
+	if (!tooltip.isEmpty())
+	{
+		TheMouse->setCursorTooltip( tooltip );
+	}
 }
 
 

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

@@ -112,6 +112,7 @@ void LANAPI::init( void )
 
 	m_lastGameopt = "";
 
+#if TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
 	char userName[UNLEN + 1];
 	DWORD bufSize = ARRAY_SIZE(userName);
 	if (GetUserNameA(userName, &bufSize))
@@ -133,6 +134,7 @@ void LANAPI::init( void )
 	{
 		m_hostName = "unknown";
 	}
+#endif
 }
 
 void LANAPI::reset( void )
@@ -451,11 +453,13 @@ void LANAPI::update( void )
 			}
 			else
 			{
+#if TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
 				AsciiString text;
 				text.format("User=%s", m_userName.str());
 				RequestGameOptions( text, true );
 				text.format("Host=%s", m_hostName.str());
 				RequestGameOptions( text, true );
+#endif
 				RequestGameOptions( "HELLO", false );
 			}
 		}

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

@@ -996,14 +996,22 @@ void updateGameOptions( void )
 void setLANPlayerTooltip(LANPlayer* player)
 {
 	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
+
+	if (!player->getLogin().isEmpty() || !player->getHost().isEmpty())
+	{
+		tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
+	}
+
 #if defined(RTS_DEBUG)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
 	tooltip.concat(ip);
 #endif
-	TheMouse->setCursorTooltip( tooltip );
 
+	if (!tooltip.isEmpty())
+	{
+		TheMouse->setCursorTooltip( tooltip );
+	}
 }
 
 

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

@@ -112,6 +112,7 @@ void LANAPI::init( void )
 
 	m_lastGameopt = "";
 
+#if TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
 	char userName[UNLEN + 1];
 	DWORD bufSize = ARRAY_SIZE(userName);
 	if (GetUserNameA(userName, &bufSize))
@@ -133,6 +134,7 @@ void LANAPI::init( void )
 	{
 		m_hostName = "unknown";
 	}
+#endif
 }
 
 void LANAPI::reset( void )
@@ -451,11 +453,13 @@ void LANAPI::update( void )
 			}
 			else
 			{
+#if TELL_COMPUTER_IDENTITY_IN_LAN_LOBBY
 				AsciiString text;
 				text.format("User=%s", m_userName.str());
 				RequestGameOptions( text, true );
 				text.format("Host=%s", m_hostName.str());
 				RequestGameOptions( text, true );
+#endif
 				RequestGameOptions( "HELLO", false );
 			}
 		}