[GEN][ZH] Fix Lan player tooltip (#408)

helmutbuhler · web-flow · commit b5ebe6333931 · 2025-06-18T09:10:06.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -220,7 +220,7 @@ static void playerTooltip(GameWindow *window,
 		return;
 	}
 	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
+	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
 #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -311,7 +311,7 @@ static void playerTooltip(GameWindow *window,
 		return;
 	}
 	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
+	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
 #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
@@ -227,7 +227,7 @@ static void playerTooltip(GameWindow *window,
 		return;
 	}
 	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
+	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
 #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp
@@ -353,7 +353,7 @@ static void playerTooltip(GameWindow *window,
 		return;
 	}
 	UnicodeString tooltip;
-	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());
+	tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());
 #if defined(RTS_DEBUG) || defined(RTS_INTERNAL)
 	UnicodeString ip;
 	ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ static void playerTooltip(GameWindow *window,`
`220`	`220`	`return;`
`221`	`221`	`}`
`222`	`222`	`UnicodeString tooltip;`
`223`		`- tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
	`223`	`+ tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());`
`224`	`224`	`#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`225`	`225`	`UnicodeString ip;`
`226`	`226`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ static void playerTooltip(GameWindow *window,`
`311`	`311`	`return;`
`312`	`312`	`}`
`313`	`313`	`UnicodeString tooltip;`
`314`		`- tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
	`314`	`+ tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());`
`315`	`315`	`#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`316`	`316`	`UnicodeString ip;`
`317`	`317`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ static void playerTooltip(GameWindow *window,`
`227`	`227`	`return;`
`228`	`228`	`}`
`229`	`229`	`UnicodeString tooltip;`
`230`		`- tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
	`230`	`+ tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());`
`231`	`231`	`#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`232`	`232`	`UnicodeString ip;`
`233`	`233`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ static void playerTooltip(GameWindow *window,`
`353`	`353`	`return;`
`354`	`354`	`}`
`355`	`355`	`UnicodeString tooltip;`
`356`		`- tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getName().str(), player->getLogin().str(), player->getHost().str());`
	`356`	`+ tooltip.format(TheGameText->fetch("TOOLTIP:LANPlayer"), player->getLogin().str(), player->getHost().str());`
`357`	`357`	`#if defined(RTS_DEBUG) \|\| defined(RTS_INTERNAL)`
`358`	`358`	`UnicodeString ip;`
`359`	`359`	`ip.format(L" - %d.%d.%d.%d", PRINTF_IP_AS_4_INTS(player->getIP()));`