Remove old player slots code

Author: x64-dev

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

@@ -6,8 +6,6 @@
 #include "OnlineServices_Init.h"
 #include "Common/MultiplayerSettings.h"
 
-extern Color PlayerSlotColors[MAX_SLOTS];
-
 extern NGMPGame* TheNGMPGame;
 
 enum class EChatMessageType

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

@@ -1438,11 +1438,11 @@ void InitWOLGameGadgets( void )
 
 		if (theGameInfo->getLocalSlotNum() != i)
 		{
-			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:Open"), PlayerSlotColors[i]);
-			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:Closed"), PlayerSlotColors[i]);
-			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:EasyAI"), PlayerSlotColors[i]);
-			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:MediumAI"), PlayerSlotColors[i]);
-			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:HardAI"), PlayerSlotColors[i]);
+			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:Open"), GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
+			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:Closed"), GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
+			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:EasyAI"), GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
+			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:MediumAI"), GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
+			GadgetComboBoxAddEntry(comboBoxPlayer[i], TheGameText->fetch("GUI:HardAI"), GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
 			GadgetComboBoxSetSelectedPos(comboBoxPlayer[i], 0);
 		}
 		else
@@ -1451,7 +1451,7 @@ void InitWOLGameGadgets( void )
 			NGMPGameSlot* slot = theGameInfo->getGameSpySlot(i);
 			if (slot)
 			{
-				GadgetComboBoxAddEntry(comboBoxPlayer[i], slot->getName(), PlayerSlotColors[i]);
+				GadgetComboBoxAddEntry(comboBoxPlayer[i], slot->getName(), GameSpyColor[GSCOLOR_PLAYER_NORMAL]);
 				GadgetComboBoxSetSelectedPos(comboBoxPlayer[i], 0);
 			}
 		}

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

@@ -9,18 +9,6 @@
 std::string m_strNetworkLogFileName;
 std::mutex m_logMutex;
 
-Color PlayerSlotColors[MAX_SLOTS] =
-{
-	GameMakeColor(0, 162, 232, 255),
-	GameMakeColor(255, 0, 0, 255),
-	GameMakeColor(0, 255, 0, 255),
-	GameMakeColor(0, 0, 255, 255),
-	GameMakeColor(255, 194, 15, 255),
-	GameMakeColor(163, 73, 164, 255),
-	GameMakeColor(230, 157, 181, 255),
-	GameMakeColor(16, 82, 35, 255),
-};
-
 std::string to_utf8(const std::wstring& wstr)
 {
 	std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;