Wait for network to become ready on launch

botder · botder · commit b1e88ddba310 · 2025-03-07T20:19:40.000+01:00
diff --git a/Client/core/CCommandFuncs.cpp b/Client/core/CCommandFuncs.cpp
@@ -186,6 +186,12 @@ void CCommandFuncs::Unload(const char* szParameters)
 
 void CCommandFuncs::Connect(const char* szParameters)
 {
+    if (!CCore::GetSingleton().IsNetworkReady())
+    {
+        CCore::GetSingleton().GetConsole()->Print(_("connect: Network is not ready, please wait a moment"));
+        return;
+    }
+
     // Parse the arguments (host port nick pass)
     char szBuffer[256] = "";
     if (szParameters)
@@ -273,6 +279,12 @@ void CCommandFuncs::ReloadNews(const char* szParameters)
 
 void CCommandFuncs::Reconnect(const char* szParameters)
 {
+    if (!CCore::GetSingleton().IsNetworkReady())
+    {
+        CCore::GetSingleton().GetConsole()->Print(_("reconnect: Network is not ready, please wait a moment"));
+        return;
+    }
+
     CModManager::GetSingleton().Unload();
 
     std::string  strHost, strNick, strPassword;
diff --git a/Client/core/CConnectManager.cpp b/Client/core/CConnectManager.cpp
@@ -52,6 +52,12 @@ bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const c
     assert(szNick);
     assert(szPassword);
 
+    if (!CCore::GetSingleton().IsNetworkReady())
+    {
+        CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->ShowNetworkNotReadyWindow();
+        return false;
+    }
+
     m_bNotifyServerBrowser = bNotifyServerBrowser;
 
     // For detecting startup problems
@@ -337,10 +343,13 @@ void CConnectManager::DoPulse()
     }
     else if (m_bReconnect)
     {
-        std::string strNick;
-        CVARS_GET("nick", strNick);
-        Connect(m_strHost.c_str(), m_usPort, strNick.c_str(), m_strPassword.c_str(), false);
-        m_bReconnect = false;
+        if (CCore::GetSingleton().IsNetworkReady())
+        {
+            std::string strNick;
+            CVARS_GET("nick", strNick);
+            Connect(m_strHost.c_str(), m_usPort, strNick.c_str(), m_strPassword.c_str(), false);
+            m_bReconnect = false;
+        }
     }
 }
 
diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp
@@ -117,13 +117,11 @@ CCore::CCore()
     m_pfnMessageProcessor = NULL;
     m_pMessageBox = NULL;
 
-    m_bFirstFrame = true;
     m_bIsOfflineMod = false;
     m_bQuitOnPulse = false;
     m_bDestroyMessageBox = false;
     m_bCursorToggleControls = false;
     m_bLastFocused = true;
-    m_bWaitToSetNick = false;
     m_DiagnosticDebug = EDiagnosticDebug::NONE;
 
     // Create our Direct3DData handler.
@@ -151,7 +149,6 @@ CCore::CCore()
     m_bDoneFrameRateLimit = false;
     m_uiFrameRateLimit = 0;
     m_uiServerFrameRateLimit = 0;
-    m_uiNewNickWaitFrames = 0;
     m_iUnminimizeFrameCounter = 0;
     m_bDidRecreateRenderTargets = false;
     m_fMinStreamingMemory = 0;
@@ -1236,16 +1233,22 @@ void CCore::DoPostFramePulse()
     // This is the first frame in the menu?
     if (m_pGame->GetSystemState() == 7)            // GS_FRONTEND
     {
-        if (m_bFirstFrame)
-        {
-            m_bFirstFrame = false;
+        if (m_menuFrame < 255)
+            ++m_menuFrame;
 
+        if (m_menuFrame == 1)
+        {
             WatchDogCompletedSection("L2");            // gta_sa.set seems ok
             WatchDogCompletedSection("L3");            // No hang on startup
             HandleCrashDumpEncryption();
 
             // Disable vsync while it's all dark
             m_pGame->DisableVSync();
+        }
+
+        if (m_menuFrame >= 5 && !m_isNetworkReady && m_pNet->IsReady())
+        {
+            m_isNetworkReady = true;
 
             // Parse the command line
             // Does it begin with mtasa://?
@@ -1269,16 +1272,11 @@ void CCore::DoPostFramePulse()
             }
         }
 
-        if (m_bWaitToSetNick && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())
+        if (m_menuFrame >= 75 && m_requestNewNickname && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())
         {
-            if (m_uiNewNickWaitFrames > 75)
-            {
-                // Request a new nickname if we're waiting for one
-                GetLocalGUI()->GetMainMenu()->GetSettingsWindow()->RequestNewNickname();
-                m_bWaitToSetNick = false;
-            }
-            else
-                m_uiNewNickWaitFrames++;
+            // Request a new nickname if we're waiting for one
+            GetLocalGUI()->GetMainMenu()->GetSettingsWindow()->RequestNewNickname();
+            m_requestNewNickname = false;
         }
     }
 
diff --git a/Client/core/CCore.h b/Client/core/CCore.h
@@ -238,8 +238,8 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     std::map<std::string, std::string>& GetCommandLineOptions() { return m_CommandLineOptions; }
     const char*                         GetCommandLineOption(const char* szOption);
     const char*                         GetCommandLineArgs() { return m_szCommandLineArgs; }
-    void                                RequestNewNickOnStart() { m_bWaitToSetNick = true; };
-    bool                                WillRequestNewNickOnStart() { return m_bWaitToSetNick; };
+    void                                RequestNewNickOnStart() { m_requestNewNickname = true; }
+    bool                                WillRequestNewNickOnStart() { return m_requestNewNickname; }
     bool                                WasLaunchedWithConnectURI();
     void                                HandleCrashDumpEncryption();
 
@@ -279,7 +279,9 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     void        SetFakeLagCommandEnabled(bool bEnabled) { m_bFakeLagCommandEnabled = bEnabled; }
     bool        IsFakeLagCommandEnabled() { return m_bFakeLagCommandEnabled; }
     SString     GetBlueCopyrightString();
-    bool        IsFirstFrame() const noexcept { return m_bFirstFrame; }
+
+    bool IsNetworkReady() const noexcept { return m_isNetworkReady; }
+    bool CanHandleKeyMessages() const noexcept { return m_menuFrame > 1; }
 
     void   SetCustomStreamingMemory(size_t szMB);
     bool   IsUsingCustomStreamingMemorySize();
@@ -346,7 +348,8 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CKeyBinds*     m_pKeyBinds;
     CMouseControl* m_pMouseControl;
 
-    bool              m_bFirstFrame;
+    unsigned short    m_menuFrame{};
+    bool              m_isNetworkReady{};
     bool              m_bIsOfflineMod;
     bool              m_bCursorToggleControls;
     pfnProcessMessage m_pfnMessageProcessor;
@@ -368,8 +371,7 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     CElapsedTimeHD       m_FrameRateTimer;
     uint                 m_uiQueuedFrameRate;
     bool                 m_bQueuedFrameRateValid;
-    bool                 m_bWaitToSetNick;
-    uint                 m_uiNewNickWaitFrames;
+    bool                 m_requestNewNickname{false};
     EDiagnosticDebugType m_DiagnosticDebug;
 
     // Below 2 are used for the UI only
diff --git a/Client/core/CMainMenu.cpp b/Client/core/CMainMenu.cpp
@@ -845,6 +845,19 @@ bool CMainMenu::OnMenuClick(CGUIMouseEventArgs Args)
                 break;
         }
     }
+    else if (!g_pCore->IsNetworkReady())
+    {
+        switch (m_pHoveredItem->menuType)
+        {
+            // case MENU_ITEM_QUICK_CONNECT:  // We only prevent it for left click in OnQuickConnectButtonClick.
+            case MENU_ITEM_HOST_GAME:
+            case MENU_ITEM_MAP_EDITOR:
+                ShowNetworkNotReadyWindow();
+                return true;
+            default:
+                break;
+        }
+    }
 
     switch (m_pHoveredItem->menuType)
     {
@@ -886,12 +899,21 @@ bool CMainMenu::OnQuickConnectButtonClick(CGUIElement* pElement, bool left)
         return false;
 
     if (left)
+    {
+        if (!g_pCore->IsNetworkReady())
+        {
+            ShowNetworkNotReadyWindow();
+            return true;
+        }
+
         g_pCore->GetCommands()->Execute("reconnect", "");
+    }
     else
     {
         m_ServerBrowser.SetVisible(true);
         m_ServerBrowser.OnQuickConnectButtonClick();
     }
+
     return true;
 }
 
@@ -1171,6 +1193,26 @@ void CMainMenu::AskUserIfHeWantsToDisconnect(uchar menuType)
     pQuestionBox->Show();
 }
 
+/////////////////////////////////////////////////////////////
+//
+// CMainMenu::ShowNetworkNotReadyWindow
+//
+// Shows a window with information that the network module is not ready.
+//
+/////////////////////////////////////////////////////////////
+void CMainMenu::ShowNetworkNotReadyWindow()
+{
+    static auto HideQuestionWindow = [](void* window, uint) { reinterpret_cast<CQuestionBox*>(window)->Hide(); };
+
+    CQuestionBox& window = m_QuestionBox;
+    window.Reset();
+    window.SetTitle(_("INFORMATION"));
+    window.SetMessage("\n\nThe network module is not ready.\nPlease wait a moment and try again.");
+    window.SetButton(0, _("Ok"));
+    window.SetCallback(HideQuestionWindow, &window);
+    window.Show();
+}
+
 /////////////////////////////////////////////////////////////
 //
 // CMainMenu::StaticWantsToDisconnectCallBack
diff --git a/Client/core/CMainMenu.h b/Client/core/CMainMenu.h
@@ -75,6 +75,8 @@ class CMainMenu
     void        WantsToDisconnectCallBack(void* pData, uint uiButton);
     void        AskUserIfHeWantsToDisconnect(uchar menuType);
 
+    void ShowNetworkNotReadyWindow();
+
 private:
     sMenuItem* CreateItem(unsigned char menuType, const char* szFilename, CVector2D vecRelPosition);
     bool       SetItemHoverProgress(sMenuItem* pItem, float fProgress, bool bHovering);
diff --git a/Client/core/CMessageLoopHook.cpp b/Client/core/CMessageLoopHook.cpp
@@ -200,8 +200,7 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM w
         if (pCDS->dwData == URI_CONNECT)
         {
             // We can receive this message before we are ready to process it (e.g. trying to show a CEGUI message window before CEGUI is initialized).
-            // Ignore these messages until we are in the main menu (when CCore sets m_bFirstFrame to false)
-            if (!g_pCore->IsFirstFrame())
+            if (g_pCore->IsNetworkReady())
             {
                 LPSTR szConnectInfo = (LPSTR)pCDS->lpData;
                 CCommandFuncs::Connect(szConnectInfo);
@@ -456,7 +455,7 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM w
             }
 
             // Lead the message through the keybinds message processor
-            if (!g_pCore->IsFirstFrame())
+            if (g_pCore->CanHandleKeyMessages())
             {
                 g_pCore->GetKeyBinds()->ProcessMessage(hwnd, uMsg, wParam, lParam);
             }
diff --git a/Client/sdk/net/CNet.h b/Client/sdk/net/CNet.h
@@ -74,6 +74,7 @@ class CNet
 
     virtual void SetFakeLag(unsigned short usPacketLoss, unsigned short usMinExtraPing, unsigned short usExtraPingVariance, int iKBPSLimit) = 0;
 
+    virtual bool IsReady() = 0;
     virtual bool IsConnected() = 0;
 
     virtual void DoPulse() = 0;
diff --git a/Shared/sdk/version.h b/Shared/sdk/version.h
@@ -108,7 +108,7 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _CLIENT_NET_MODULE_VERSION      0x0B1       // (0x000 - 0xfff) Lvl9 wizards only
+#define _CLIENT_NET_MODULE_VERSION      0x0B2       // (0x000 - 0xfff) Lvl9 wizards only
 #define _SERVER_NET_MODULE_VERSION      0x0AB       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1DA       // (0x000 - 0xfff) Increment when net messages change (pre-release)
 

Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,7 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM w`
`200`	`200`	`if (pCDS->dwData == URI_CONNECT)`
`201`	`201`	`{`
`202`	`202`	`// We can receive this message before we are ready to process it (e.g. trying to show a CEGUI message window before CEGUI is initialized).`
`203`		`- // Ignore these messages until we are in the main menu (when CCore sets m_bFirstFrame to false)`
`204`		`- if (!g_pCore->IsFirstFrame())`
	`203`	`+ if (g_pCore->IsNetworkReady())`
`205`	`204`	`{`
`206`	`205`	`LPSTR szConnectInfo = (LPSTR)pCDS->lpData;`
`207`	`206`	`CCommandFuncs::Connect(szConnectInfo);`
`@@ -456,7 +455,7 @@ LRESULT CALLBACK CMessageLoopHook::ProcessMessage(HWND hwnd, UINT uMsg, WPARAM w`
`456`	`455`	`}`
`457`	`456`
`458`	`457`	`// Lead the message through the keybinds message processor`
`459`		`- if (!g_pCore->IsFirstFrame())`
	`458`	`+ if (g_pCore->CanHandleKeyMessages())`
`460`	`459`	`{`
`461`	`460`	`g_pCore->GetKeyBinds()->ProcessMessage(hwnd, uMsg, wParam, lParam);`
`462`	`461`	`}`