Chat color now matches lan behavior

Author: x64-dev

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

@@ -4,17 +4,20 @@
 #include "NetworkMesh.h"
 #include "../GameSpy/PeerDefs.h"
 #include "OnlineServices_Init.h"
+#include "Common/MultiplayerSettings.h"
 
 extern Color PlayerSlotColors[MAX_SLOTS];
 
+extern NGMPGame* TheNGMPGame;
+
 enum class EChatMessageType
 {
 	CHAT_MESSAGE_TYPE_NETWORK_ROOM,
 	CHAT_MESSAGE_TYPE_LOBBY
 };
 static Color DetermineColorForChatMessage(EChatMessageType chatMessageType, Bool isPublic, Bool isAction, int lobbySlot = -1)
 {
-	Color style;
+	Color style = GameMakeColor(255, 255, 255, 255);
 
 	// TODO_NGMP: Support owner chat again
 	Bool isOwner = false;
@@ -34,7 +37,21 @@ static Color DetermineColorForChatMessage(EChatMessageType chatMessageType, Bool
 			}
 			else
 			{
-				style = PlayerSlotColors[lobbySlot];
+				if (TheNGMPGame)
+				{
+					GameSlot* pSlot = TheNGMPGame->getSlot(lobbySlot);
+
+					if (pSlot != nullptr)
+					{
+						int numColors = TheMultiplayerSettings->getNumColors();
+						int color = pSlot->getColor();
+						if (color > -1 && color < numColors)
+						{
+							MultiplayerColorDefinition* def = TheMultiplayerSettings->getColor(color);
+							style = def->getColor();
+						}
+					}
+				}
 			}
 		}
 		else