[GEN][ZH] Fix broken Player muting for Observer (#1307)

roossienb · web-flow · commit f4a05b5acb1a · 2025-07-20T23:03:54.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -661,7 +661,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 	
 	Bool fromObserver = !player->isPlayerActive();
 	Bool amIObserver = !ThePlayerList->getLocalPlayer()->isPlayerActive();
-	Bool canSeeChat = amIObserver || !fromObserver && !TheGameInfo->getConstSlot(playerID)->isMuted();
+	Bool canSeeChat = (amIObserver || !fromObserver) && !TheGameInfo->getConstSlot(playerID)->isMuted();
 	
 	if ( ((1<<m_localSlot) & msg->getPlayerMask() ) && canSeeChat  )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -661,7 +661,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)
 	
 	Bool fromObserver = !player->isPlayerActive();
 	Bool amIObserver = !ThePlayerList->getLocalPlayer()->isPlayerActive();
-	Bool canSeeChat = amIObserver || !fromObserver && !TheGameInfo->getConstSlot(playerID)->isMuted();
+	Bool canSeeChat = (amIObserver || !fromObserver) && !TheGameInfo->getConstSlot(playerID)->isMuted();
 	
 	if ( ((1<<m_localSlot) & msg->getPlayerMask() ) && canSeeChat  )
 	{

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ void ConnectionManager::processChat(NetChatCommandMsg *msg)`
`661`	`661`
`662`	`662`	`Bool fromObserver = !player->isPlayerActive();`
`663`	`663`	`Bool amIObserver = !ThePlayerList->getLocalPlayer()->isPlayerActive();`
`664`		`- Bool canSeeChat = amIObserver \|\| !fromObserver && !TheGameInfo->getConstSlot(playerID)->isMuted();`
	`664`	`+ Bool canSeeChat = (amIObserver \|\| !fromObserver) && !TheGameInfo->getConstSlot(playerID)->isMuted();`
`665`	`665`
`666`	`666`	`if ( ((1<<m_localSlot) & msg->getPlayerMask() ) && canSeeChat )`
`667`	`667`	`{`