- lobby tear down

- http mgr improvements
- enable more UI flows

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/HTTP/HTTPManager.h

@@ -11,9 +11,10 @@
 
 enum class EHTTPVerb
 {
-	GET,
-	POST,
-	PUT
+	HTTP_VERB_GET,
+	HTTP_VERB_POST,
+	HTTP_VERB_PUT,
+	HTTP_VERB_DELETE
 };
 
 enum class EIPProtocolVersion
@@ -34,6 +35,7 @@ class HTTPManager
 	void SendGETRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, std::function<void(bool bSuccess, int statusCode, std::string strBody)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr);
 	void SendPOSTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, const char* szPostData, std::function<void(bool bSuccess, int statusCode, std::string strBody)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr);
 	void SendPUTRequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, const char* szData, std::function<void(bool bSuccess, int statusCode, std::string strBody)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr);
+	void SendDELETERequest(const char* szURI, EIPProtocolVersion protover, std::map<std::string, std::string>& inHeaders, const char* szData, std::function<void(bool bSuccess, int statusCode, std::string strBody)> completionCallback, std::function<void(size_t bytesReceived)> progressCallback = nullptr);
 
 	void Shutdown();
 

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

@@ -75,6 +75,8 @@ class NetworkMesh
 	void ConnectToSingleUser(ENetAddress addr, Int64 user_id, bool bIsReconnect = false);
 	void ConnectToMesh(LobbyEntry& lobby);
 
+	void Disconnect();
+
 	void Tick();
 
 	int64_t m_lastPing = -1;

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

@@ -38,6 +38,7 @@ class WebSocket
 
 	void SendData_RoomChatMessage(const char* szMessage);
 	void SendData_JoinNetworkRoom(int roomID);
+	void SendData_LeaveNetworkRoom();
 	void SendData_MarkReady(bool bReady);
 
 	void Tick();

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

@@ -253,10 +253,14 @@ class NGMP_OnlineServices_LobbyInterface
 
 	void JoinLobby(int index);
 
+	void LeaveCurrentLobby();
+
 	LobbyEntry GetLobbyFromIndex(int index);
 
 	std::vector<LobbyEntry> m_vecLobbies;
 
+	bool m_bPendingHostHasLeft = false;
+
 private:
 	std::vector<std::function<void(bool)>> m_vecCreateLobby_PendingCallbacks = std::vector<std::function<void(bool)>>();
 

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

@@ -24,6 +24,11 @@ class NGMP_OnlineServices_RoomsInterface
 	std::function<void()> m_PendingRoomJoinCompleteCallback = nullptr;
 	void JoinRoom(int roomIndex, std::function<void()> onStartCallback, std::function<void()> onCompleteCallback);
 
+	void LeaveRoom()
+	{
+		NGMP_OnlineServicesManager::GetInstance()->GetWebSocket()->SendData_LeaveNetworkRoom();
+	}
+
 	std::function<void(UnicodeString strMessage)> m_OnChatCallback = nullptr;
 	void RegisterForChatCallback(std::function<void(UnicodeString strMessage)> cb)
 	{

GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp

@@ -776,39 +776,39 @@ void GameEngine::update( void )
 		{
 
 			// VERIFY CRC needs to be in this code block.  Please to not pull TheGameLogic->update() inside this block.
-			VERIFY_CRC
+VERIFY_CRC
 
-			TheRadar->UPDATE();
+TheRadar->UPDATE();
 
-			/// @todo Move audio init, update, etc, into GameClient update
-			
-			TheAudio->UPDATE();
-			TheGameClient->UPDATE();
-			TheMessageStream->propagateMessages();
+/// @todo Move audio init, update, etc, into GameClient update
 
-			if (g_bTearDownGeneralsOnlineRequested) // delayed tear down
-			{
-				g_bTearDownGeneralsOnlineRequested = false;
+TheAudio->UPDATE();
+TheGameClient->UPDATE();
+TheMessageStream->propagateMessages();
 
-				if (g_pOnlineServicesMgr != nullptr)
-				{
-					g_pOnlineServicesMgr->Shutdown();
-					delete g_pOnlineServicesMgr;
-					g_pOnlineServicesMgr = nullptr;
-				}
+if (g_bTearDownGeneralsOnlineRequested) // delayed tear down
+{
+	g_bTearDownGeneralsOnlineRequested = false;
 
-			}
-			if (g_pOnlineServicesMgr != nullptr)
-			{
-				g_pOnlineServicesMgr->Tick();
-			}
+	if (g_pOnlineServicesMgr != nullptr)
+	{
+		g_pOnlineServicesMgr->Shutdown();
+		delete g_pOnlineServicesMgr;
+		g_pOnlineServicesMgr = nullptr;
+	}
 
-			if (TheNetwork != NULL)
-			{
-				TheNetwork->UPDATE();
-			}
-			 
-			TheCDManager->UPDATE();
+}
+if (g_pOnlineServicesMgr != nullptr)
+{
+	g_pOnlineServicesMgr->Tick();
+}
+
+if (TheNetwork != NULL)
+{
+	TheNetwork->UPDATE();
+}
+
+TheCDManager->UPDATE();
 		}
 
 
@@ -817,7 +817,7 @@ void GameEngine::update( void )
 			TheGameLogic->UPDATE();
 		}
 
-		
+
 
 	}	// end perfGather
 
@@ -828,18 +828,18 @@ extern bool DX8Wrapper_IsWindowed;
 extern HWND ApplicationHWnd;
 
 /** -----------------------------------------------------------------------------------------------
- * The "main loop" of the game engine. It will not return until the game exits. 
+ * The "main loop" of the game engine. It will not return until the game exits.
  */
-void GameEngine::execute( void )
+void GameEngine::execute(void)
 {
-	
+
 	DWORD prevTime = timeGetTime();
 #if defined(_DEBUG) || defined(_INTERNAL)
 	DWORD startTime = timeGetTime() / 1000;
 #endif
 
 	// pretty basic for now
-	while( !m_quitting )
+	while (!m_quitting)
 	{
 
 		//if (TheGlobalData->m_vTune)
@@ -872,34 +872,46 @@ void GameEngine::execute( void )
 				}
 			}
 #endif
-			
+
 			{
-				try 
+				if (IsDebuggerPresent())
 				{
 					// compute a frame
 					update();
 				}
-				catch (INIException e)
+				else
 				{
-					// Release CRASH doesn't return, so don't worry about executing additional code.
-					if (e.mFailureMessage)
-						RELEASE_CRASH((e.mFailureMessage));
-					else
-						RELEASE_CRASH(("Uncaught Exception in GameEngine::update"));
-				}
-				catch (...)
-				{
-					// try to save info off
-					try 
+					try
 					{
-						if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD && TheRecorder->isMultiplayer())
-							TheRecorder->cleanUpReplayFile();
+						// compute a frame
+						update();
 					}
-					catch (...)
+					catch (INIException e)
 					{
+						// Release CRASH doesn't return, so don't worry about executing additional code.
+						if (e.mFailureMessage)
+							RELEASE_CRASH((e.mFailureMessage));
+						else
+							RELEASE_CRASH(("Uncaught Exception in GameEngine::update"));
 					}
-					RELEASE_CRASH(("Uncaught Exception in GameEngine::update"));
-				}	// catch
+					catch (...)
+					{
+						// try to save info off
+						try
+						{
+							if (TheRecorder && TheRecorder->getMode() == RECORDERMODETYPE_RECORD && TheRecorder->isMultiplayer())
+								TheRecorder->cleanUpReplayFile();
+						}
+						catch (const std::exception& e) // caught by reference to base
+						{
+							NetworkLog("A standard exception was caught, with message: %s", e.what());
+						}
+						catch (...)
+						{
+						}
+						RELEASE_CRASH(("Uncaught Exception in GameEngine::update"));
+					}	// catch
+				}
 			}	// perf
 
 			{

GeneralsMD/Code/GameEngine/Source/Common/UserPreferences.cpp

@@ -433,11 +433,11 @@ CustomMatchPreferences::CustomMatchPreferences()
 {
 	AsciiString userPrefFilename;
 
-	// TODO_NGMP: Impl again
+	// NGMP: Just return 0 - the gamespy profile ID is only ever set to 0 anyway
 #if defined(GENERALS_ONLINE)
-	Int localProfile = TheGameSpyInfo->getLocalProfileID();
-#else
 	Int localProfile = 0;
+#else
+	Int localProfile = TheGameSpyInfo->getLocalProfileID();
 #endif
 	userPrefFilename.format("GeneralsOnline\\CustomPref%d.ini", localProfile);
 	load(userPrefFilename);

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

@@ -255,23 +255,28 @@ WindowLayout *WOLMapSelectLayout = NULL;
 void PopBackToLobby( void )
 {
 	// delete TheNAT, its no good for us anymore.
-	delete TheNAT;
-	TheNAT = NULL;
+	if (TheNAT != nullptr)
+	{
+		delete TheNAT;
+		TheNAT = NULL;
+	}
 
-	if (TheGameSpyInfo) // this can be blown away by a disconnect on the map transfer screen
+	if (TheNGMPGame) // this can be blown away by a disconnect on the map transfer screen
 	{
-		NGMPGame* game = NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetCurrentGame();
+		TheNGMPGame->reset();
+
 
-		game->reset();
-		TheGameSpyInfo->leaveStagingRoom();
-		//TheGameSpyInfo->joinBestGroupRoom();
 	}
 
+	NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->LeaveCurrentLobby();
+
 	DEBUG_LOG(("PopBackToLobby() - parentWOLGameSetup is %X\n", parentWOLGameSetup));
 	if (parentWOLGameSetup)
 	{
 		nextScreen = "Menus/WOLCustomLobby.wnd";
 		TheShell->pop();
+
+
 	}
 }
 
@@ -1414,6 +1419,11 @@ Bool initialAcceptEnable = FALSE;
 //-------------------------------------------------------------------------------------------------
 void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 {
+	// TODO_NGMP: impl this again
+	GameWindow* buttonBuddy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("GameSpyGameOptionsMenu.wnd:ButtonCommunicator"));
+	if (buttonBuddy)
+		buttonBuddy->winEnable(FALSE);
+
 	// register for chat events
 	NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->RegisterForChatCallback([](UnicodeString strMessage)
 		{
@@ -1787,6 +1797,24 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 		return;
 	}
 
+	if (NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->m_bPendingHostHasLeft)
+	{
+		NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->m_bPendingHostHasLeft = false;
+
+		buttonPushed = true;
+		DEBUG_LOG(("Host left lobby\n"));
+		if (TheNGMPGame)
+			TheNGMPGame->reset();
+
+		// TODO_NGMP: Impl host migration, less annoying for users
+
+		GSMessageBoxOk(TheGameText->fetch("GUI:HostLeftTitle"), TheGameText->fetch("GUI:HostLeft"));
+		
+		PopBackToLobby();
+
+		return;
+	}
+
 	if (raiseMessageBoxes)
 	{
 		RaiseGSMessageBox();
@@ -1814,6 +1842,7 @@ void WOLGameSetupMenuUpdate( WindowLayout * layout, void *userData)
 				{
 				case PeerResponse::PEERRESPONSE_DISCONNECT:
 					{
+					// TODO_NGMP: hook this up again
 						sawImportantMessage = TRUE;
 						AsciiString disconMunkee;
 						disconMunkee.format("GUI:GSDisconReason%d", resp.discon.reason);
@@ -2966,13 +2995,8 @@ WindowMsgHandledType WOLGameSetupMenuSystem( GameWindow *window, UnsignedInt msg
 						WOLMapSelectLayout = NULL;
 					}
 
-					NGMPGame* game = NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->GetCurrentGame();
-					game->reset();
-					//peerLeaveRoom(TheGameSpyChat->getPeer(), StagingRoom, NULL);
-					TheGameSpyInfo->leaveStagingRoom();
-					buttonPushed = true;
-					nextScreen = "Menus/WOLCustomLobby.wnd";
-					TheShell->pop();
+					
+					PopBackToLobby();
 
 				} //if ( controlID == buttonBack )
 				else if ( controlID == buttonCommunicatorID )

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

@@ -743,6 +743,11 @@ void NGMP_WOLLobbyMenu_JoinLobbyCallback(bool bSuccess)
 //-------------------------------------------------------------------------------------------------
 void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
 {
+	// TODO_NGMP: impl this again
+	GameWindow* buttonBuddy = TheWindowManager->winGetWindowFromId(NULL, NAMEKEY("WOLCustomLobby.wnd:ButtonBuddy"));
+	if (buttonBuddy)
+		buttonBuddy->winEnable(FALSE);
+
 	nextScreen = NULL;
 	buttonPushed = false;
 	isShuttingDown = false;
@@ -1750,7 +1755,7 @@ WindowMsgHandledType WOLLobbyMenuSystem( GameWindow *window, UnsignedInt msg,
 						break;
 
 					// Leave any group room, then pop off the screen
-					TheGameSpyInfo->leaveGroupRoom();
+					NGMP_OnlineServicesManager::GetInstance()->GetRoomsInterface()->LeaveRoom();
 
 					SetLobbyAttemptHostJoin( TRUE ); // pretend, since we don't want to queue up another action
 					buttonPushed = true;

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

@@ -623,7 +623,7 @@ void WOLWelcomeMenuInit( WindowLayout *layout, void *userData )
 	buttonQuickMatch->winEnable(false);
 	buttonMyInfo->winEnable(false);
 	buttonBuddies->winEnable(false);
-	buttonbuttonOptions->winEnable(false);
+	//buttonbuttonOptions->winEnable(false);
 #else
 	enableControls(TheGameSpyInfo->gotGroupRoomList());
 #endif