Sync team, side, color and starting position to/from lobby service

Author: x64-dev

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

@@ -12,6 +12,11 @@ struct LobbyMemberEntry : public NetworkMemberBase
 	uint16_t preferredPort;
 	// NOTE: NetworkMemberBase is not deserialized
 
+	int side = -1;
+	int color = -1;
+	int team = -1;
+	int startpos = -1;
+
 	bool IsValid() const { return user_id != -1; }
 };
 
@@ -59,6 +64,11 @@ class NGMP_OnlineServices_LobbyInterface
 	// updates
 	void UpdateCurrentLobby_Map(AsciiString strMap, AsciiString strMapPath, int newMaxPlayers);
 
+	void UpdateCurrentLobby_MySide(int side, int updatedStartPos);
+	void UpdateCurrentLobby_MyColor(int side);
+	void UpdateCurrentLobby_MyStartPos(int side);
+	void UpdateCurrentLobby_MyTeam(int side);
+
 	void SetLobbyListDirty()
 	{
 		m_bLobbyListDirty = true;

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

@@ -552,8 +552,6 @@ NameKeyType listboxGameSetupChatID = NAMEKEY_INVALID;
 
 static void handleColorSelection(int index)
 {
-	// TODO_NGMP
-	return;
 	GameWindow *combo = comboBoxColor[index];
 	Int color, selIndex;
 	GadgetComboBoxGetSelectedPos(combo, &selIndex);
@@ -582,35 +580,19 @@ static void handleColorSelection(int index)
 					}
 				}
 			}
+
+			// TODO_NGMP: Enforce this on the service too
 			if(!colorAvailable)
 				return;
 		}
 
-		slot->setColor(color);
+		// NGMP: Dont set it locally / directly anymore, rely on the lobby service instead
+		//slot->setColor(color);
 
-		if (TheGameSpyInfo->amIHost())
-		{
-			// send around a new slotlist
-			TheGameSpyInfo->setGameOptions();
-			WOLDisplaySlotList();
-		}
-		else
+		// NGMP: Update lobby (if local, for remote players we'll get it from the service)
+		if (index == myGame->getLocalSlotNum())
 		{
-			// request the color from the host
-			if (!slot->isPlayer(TheGameSpyInfo->getLocalName()))
-				return;
-
-			AsciiString options;
-			options.format("Color=%d", color);
-			AsciiString hostName;
-			hostName.translate(myGame->getSlot(0)->getName());
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-			req.UTM.isStagingRoom = TRUE;
-			req.id = "REQ/";
-			req.nick = hostName.str();
-			req.options = options.str();
-			TheGameSpyPeerMessageQueue->addRequest(req);
+			NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->UpdateCurrentLobby_MyColor(color);
 		}
 	}
 }
@@ -632,22 +614,33 @@ static void handlePlayerTemplateSelection(int index)
 		Int oldTemplate = slot->getPlayerTemplate();
 		slot->setPlayerTemplate(playerTemplate);
 
+		int updatedStartPos = slot->getStartPos();
+
 		if (oldTemplate == PLAYERTEMPLATE_OBSERVER)
 		{
 			// was observer, so populate color & team with all, and enable
 			GadgetComboBoxSetSelectedPos(comboBoxColor[index], 0);
 			GadgetComboBoxSetSelectedPos(comboBoxTeam[index], 0);
 			slot->setStartPos(-1);
+			updatedStartPos = -1;
 		}
 		else if (playerTemplate == PLAYERTEMPLATE_OBSERVER)
 		{
 			// is becoming observer, so populate color & team with random only, and disable
 			GadgetComboBoxSetSelectedPos(comboBoxColor[index], 0);
 			GadgetComboBoxSetSelectedPos(comboBoxTeam[index], 0);
 			slot->setStartPos(-1);
+			updatedStartPos = -1;
 		}
 
+		// NGMP: Update lobby (if local, for remote players we'll get it from the service)
+		if (index == myGame->getLocalSlotNum())
+		{
+			NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->UpdateCurrentLobby_MySide(playerTemplate, updatedStartPos);
+		}
 
+		// NGMP: Dont set it locally / directly anymore, rely on the lobby service instead
+		/*
 		if (NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->IsHost())
 		{
 			// send around a new slotlist
@@ -675,16 +668,15 @@ static void handlePlayerTemplateSelection(int index)
 			req.options = options.str();
 			TheGameSpyPeerMessageQueue->addRequest(req);
 			*/
+		/*
 		}
+			*/
 	}
 }
 
 
 static void handleStartPositionSelection(Int player, int startPos)
 {
-	// TODO_NGMP
-	return;
-
 	NGMPGame* myGame = NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetCurrentGame();
 
 	if (myGame)
@@ -715,34 +707,14 @@ static void handleStartPositionSelection(Int player, int startPos)
 			if( !isAvailable )
 				return;
 		}
-		slot->setStartPos(startPos);
 
-		if (myGame->amIHost())
-		{
-			// send around a new slotlist
-			myGame->resetAccepted();
-			TheGameSpyInfo->setGameOptions();
-			WOLDisplaySlotList();
-		}
-		else
-		{
-			// request the color from the host
-			if (AreSlotListUpdatesEnabled())
-			{
-				// request the playerTemplate from the host
-				AsciiString options;
-				options.format("StartPos=%d", slot->getStartPos());
-				AsciiString hostName;
-				hostName.translate(myGame->getSlot(0)->getName());
-				PeerRequest req;
-				req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-				req.UTM.isStagingRoom = TRUE;
-				req.id = "REQ/";
-				req.nick = hostName.str();
-				req.options = options.str();
-				TheGameSpyPeerMessageQueue->addRequest(req);
+		// NGMP: Dont set it locally / directly anymore, rely on the lobby service instead
+		//slot->setStartPos(startPos);
 
-			}
+		// NGMP: Update lobby (if local, for remote players we'll get it from the service)
+		if (player == myGame->getLocalSlotNum())
+		{
+			NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->UpdateCurrentLobby_MyStartPos(startPos);
 		}
 	}
 }
@@ -751,9 +723,6 @@ static void handleStartPositionSelection(Int player, int startPos)
 
 static void handleTeamSelection(int index)
 {
-	// TODO_NGMP
-	return;
-
 	GameWindow *combo = comboBoxTeam[index];
 	Int team, selIndex;
 	GadgetComboBoxGetSelectedPos(combo, &selIndex);
@@ -767,29 +736,13 @@ static void handleTeamSelection(int index)
 		if (team == slot->getTeamNumber())
 			return;
 
-		slot->setTeamNumber(team);
+		// NGMP: Dont set it locally / directly anymore, rely on the lobby service instead
+		//slot->setTeamNumber(team);
 
-		if (TheGameSpyInfo->amIHost())
+		// NGMP: Update lobby (if local, for remote players we'll get it from the service)
+		if (index == myGame->getLocalSlotNum())
 		{
-			// send around a new slotlist
-			myGame->resetAccepted();
-			TheGameSpyInfo->setGameOptions();
-			WOLDisplaySlotList();
-		}
-		else
-		{
-			// request the team from the host
-			AsciiString options;
-			options.format("Team=%d", team);
-			AsciiString hostName;
-			hostName.translate(myGame->getSlot(0)->getName());
-			PeerRequest req;
-			req.peerRequestType = PeerRequest::PEERREQUEST_UTMPLAYER;
-			req.UTM.isStagingRoom = TRUE;
-			req.id = "REQ/";
-			req.nick = hostName.str();
-			req.options = options.str();
-			TheGameSpyPeerMessageQueue->addRequest(req);
+			NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->UpdateCurrentLobby_MyTeam(team);
 		}
 	}
 }

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

@@ -61,7 +61,7 @@ void NGMPGame::SyncWithLobby(LobbyEntry& lobby)
 void NGMPGame::UpdateSlotsFromCurrentLobby()
 {
 	// NOTE: Generals expects slot 0 to be host, this is hardcoded in places, EOS always returns the local player in index 0, so we need to correct this...
-	bool bAddedFirstAI = false;
+	//bool bAddedFirstAI = false;
 	int realInsertPos = 1;
 
 	for (Int i = 0; i < MAX_SLOTS; ++i)
@@ -82,10 +82,10 @@ void NGMPGame::UpdateSlotsFromCurrentLobby()
 				slot->setState(SLOT_PLAYER, str, 0);
 
 				// TODO_NGMP_URGENT: not yet impl, but being out of sync causes mismatch
-				slot->setColor(5);
-				slot->setTeamNumber(0);
-				slot->setStartPos(0);
-				slot->setPlayerTemplate(PLAYERTEMPLATE_RANDOM);
+				slot->setColor(pLobbyMember.color);
+				slot->setTeamNumber(pLobbyMember.team);
+				slot->setStartPos(pLobbyMember.startpos);
+				slot->setPlayerTemplate(pLobbyMember.side);
 			}
 			else
 			{
@@ -96,10 +96,10 @@ void NGMPGame::UpdateSlotsFromCurrentLobby()
 
 
 				// TODO_NGMP_URGENT: not yet impl, but being out of sync causes mismatch
-				slot->setColor(5);
-				slot->setTeamNumber(realInsertPos);
-				slot->setStartPos(realInsertPos);
-				slot->setPlayerTemplate(PLAYERTEMPLATE_RANDOM);
+				slot->setColor(pLobbyMember.color);
+				slot->setTeamNumber(pLobbyMember.team);
+				slot->setStartPos(pLobbyMember.startpos);
+				slot->setPlayerTemplate(pLobbyMember.side);
 				++realInsertPos;
 				// TODO_NGMP: Check player lists are synced across game with > 2 clients
 			}
@@ -124,6 +124,7 @@ void NGMPGame::UpdateSlotsFromCurrentLobby()
 		{
 			// TODO_NGMP: Support AI slots
 
+			/*
 			// set empty
 			NGMPGameSlot* slot = (NGMPGameSlot*)getSlot(i);
 
@@ -146,6 +147,7 @@ void NGMPGame::UpdateSlotsFromCurrentLobby()
 					slot->setState(SLOT_OPEN);
 				}
 			}
+			*/
 		}
 
 		// dont need to handle else here, we set it up upon lobby creation