Merge branch 'master' into svg-ptr-fix

Author: Lpsd

.github/workflows/run-generate-translators.yaml

@@ -0,0 +1,52 @@
+name: "Update crowdin-translators.json"
+
+on:
+  workflow_dispatch:
+  delete:
+    branches:
+      - l10n/master
+
+jobs:
+  generate_translators:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          token: ${{ secrets.POT_CI_PAT }}
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: latest
+          cache: 'npm'
+          cache-dependency-path: ./utils/localization/generate-translators/package-lock.json
+      
+      - name: Install dependencies
+        working-directory: ./utils/localization/generate-translators
+        run: npm clean-install
+      
+      - name: Generate translators
+        working-directory: ./utils/localization/generate-translators
+        env:
+          CROWDIN_TOKEN: "${{ secrets.CROWDIN_TOKEN }}"
+          CROWDIN_ORGANIZATION: "multitheftauto"
+          CROWDIN_PROJECT_ID: "13"  # Multi Theft Auto
+          CROWDIN_IGNORE_USER_ID: "2"  # multitheftautoqa
+        run: npm run ci
+      
+      - name: Commit changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+          git add ./utils/localization/generate-translators/crowdin-translators.json
+
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Update crowdin-translators.json" -m "[ci skip]"
+            git push
+          fi

Client/cefweb/CWebCore.cpp

@@ -409,7 +409,7 @@ std::unordered_set<SString> CWebCore::AllowPendingPages(bool bRemember)
     }
 
     // Trigger an event now
-    auto pCurrentMod = g_pCore->GetModManager()->GetCurrentMod();
+    auto pCurrentMod = g_pCore->GetModManager()->GetClient();
     if (!pCurrentMod)
         return std::unordered_set<SString>();
 

Client/core/CChat.cpp

@@ -699,11 +699,11 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
                 SString strPlayerNamePart = strCurrentInput.substr(iFound);
 
                 CModManager* pModManager = CModManager::GetSingletonPtr();
-                if (pModManager && pModManager->GetCurrentMod())
+                if (pModManager && pModManager->IsLoaded())
                 {
                     // Create vector and get playernames from deathmatch module
                     std::vector<SString> vPlayerNames;
-                    pModManager->GetCurrentMod()->GetPlayerNames(vPlayerNames);
+                    pModManager->GetClient()->GetPlayerNames(vPlayerNames);
 
                     for (std::vector<SString>::iterator iter = vPlayerNames.begin(); iter != vPlayerNames.end(); ++iter)
                     {

Client/core/CCommandFuncs.cpp

@@ -167,36 +167,13 @@ void CCommandFuncs::Clear(const char* szParameters)
 
 void CCommandFuncs::Load(const char* szParameters)
 {
-    if (!szParameters)
-    {
-        CCore::GetSingleton().GetConsole()->Printf("* Syntax: load <mod-name> [<arguments>]");
-        return;
-    }
-
-    // Copy the buffer
-    char* szTemp = new char[strlen(szParameters) + 1];
-    strcpy(szTemp, szParameters);
-
-    // Split it up into mod name and the arguments
-    char* szModName = strtok(szTemp, " ");
-    char* szArguments = strtok(NULL, "\0");
-
-    if (szModName)
-    {
-        // Load the mod with the given arguments
-        CModManager::GetSingleton().RequestLoad(szModName, szArguments);
-    }
-    else
-        CCore::GetSingleton().GetConsole()->Printf("* Syntax: load <mod-name> [<arguments>]");
-
-    // Free the temp buffer
-    delete[] szTemp;
+    CModManager::GetSingleton().RequestLoad(szParameters);
 }
 
 void CCommandFuncs::Unload(const char* szParameters)
 {
     // Any mod loaded?
-    if (CModManager::GetSingleton().GetCurrentMod())
+    if (CModManager::GetSingleton().IsLoaded())
     {
         // Unload it
         CModManager::GetSingleton().RequestUnload();
@@ -209,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)
@@ -264,7 +247,7 @@ void CCommandFuncs::Connect(const char* szParameters)
     CModManager::GetSingleton().Unload();
 
     // Only connect if there is no mod loaded
-    if (!CModManager::GetSingleton().GetCurrentMod())
+    if (!CModManager::GetSingleton().IsLoaded())
     {
         // Start the connect
         if (CCore::GetSingleton().GetConnectManager()->Connect(szHost, usPort, strNick.c_str(), szPass))
@@ -284,7 +267,7 @@ void CCommandFuncs::Connect(const char* szParameters)
 
 void CCommandFuncs::ReloadNews(const char* szParameters)
 {
-    if (CModManager::GetSingleton().GetCurrentMod())
+    if (CModManager::GetSingleton().IsLoaded())
     {
         CCore::GetSingleton().GetConsole()->Print("reloadnews: can't do this whilst connected to server");
         return;
@@ -296,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;
@@ -309,7 +298,7 @@ void CCommandFuncs::Reconnect(const char* szParameters)
     CModManager::GetSingleton().Unload();
 
     // Any mod loaded?
-    if (!CModManager::GetSingleton().GetCurrentMod())
+    if (!CModManager::GetSingleton().IsLoaded())
     {
         // Verify and convert the port number
         if (uiPort <= 0 || uiPort > 0xFFFF)

Client/core/CConnectManager.cpp

@@ -10,7 +10,7 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-#include "net/packetenums.h"
+#include "net/Packets.h"
 using namespace std;
 
 static CConnectManager* g_pConnectManager = NULL;
@@ -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;
+        }
     }
 }
 
@@ -364,7 +373,7 @@ bool CConnectManager::StaticProcessPacket(unsigned char ucPacketID, NetBitStream
             // Process packet data
             CCore::GetSingleton().GetNetwork()->SetServerBitStreamVersion(usServerBitStreamVersion);
 
-            if (strModName != "")
+            if (strModName == "deathmatch")
             {
                 // Populate the arguments to pass it (-c host port nick)
                 SString strArguments("%s %s", g_pConnectManager->m_strNick.c_str(), g_pConnectManager->m_strPassword.c_str());
@@ -399,7 +408,7 @@ bool CConnectManager::StaticProcessPacket(unsigned char ucPacketID, NetBitStream
                 g_pConnectManager->m_tConnectStarted = 0;
 
                 // Load the mod
-                if (!CModManager::GetSingleton().Load(strModName, strArguments))
+                if (!CModManager::GetSingleton().Load(strArguments))
                 {
                     // Failed loading the mod
                     strArguments.Format(_("No such mod installed (%s)"), strModName.c_str());

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,14 +149,14 @@ CCore::CCore()
     m_bDoneFrameRateLimit = false;
     m_uiFrameRateLimit = 0;
     m_uiServerFrameRateLimit = 0;
-    m_uiNewNickWaitFrames = 0;
     m_iUnminimizeFrameCounter = 0;
     m_bDidRecreateRenderTargets = false;
     m_fMinStreamingMemory = 0;
     m_fMaxStreamingMemory = 0;
     m_bGettingIdleCallsFromMultiplayer = false;
     m_bWindowsTimerEnabled = false;
     m_timeDiscordAppLastUpdate = 0;
+    m_CurrentRefreshRate = 60;
 
     // Create tray icon
     m_pTrayIcon = new CTrayIcon();
@@ -515,7 +513,7 @@ void CCore::EnableChatInput(char* szCommand, DWORD dwColor)
 {
     if (m_pLocalGUI)
     {
-        if (m_pGame->GetSystemState() == 9 /* GS_PLAYING_GAME */ && m_pModManager->GetCurrentMod() != NULL && !IsOfflineMod() && !m_pGame->IsAtMenu() &&
+        if (m_pGame->GetSystemState() == 9 /* GS_PLAYING_GAME */ && m_pModManager->IsLoaded() && !IsOfflineMod() && !m_pGame->IsAtMenu() &&
             !m_pLocalGUI->GetMainMenu()->IsVisible() && !m_pLocalGUI->GetConsole()->IsVisible() && !m_pLocalGUI->IsChatBoxInputEnabled())
         {
             CChat* pChat = m_pLocalGUI->GetChat();
@@ -1236,16 +1234,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://?
@@ -1262,33 +1266,18 @@ void CCore::DoPostFramePulse()
             {
                 // We want to load a mod?
                 const char* szOptionValue;
-                if (szOptionValue = GetCommandLineOption("l"))
-                {
-                    // Try to load the mod
-                    if (!m_pModManager->Load(szOptionValue, m_szCommandLineArgs))
-                    {
-                        SString strTemp(_("Error running mod specified in command line ('%s')"), szOptionValue);
-                        ShowMessageBox(_("Error") + _E("CC42"), strTemp, MB_BUTTON_OK | MB_ICON_ERROR);            // Command line Mod load failed
-                    }
-                }
-                // We want to connect to a server?
-                else if (szOptionValue = GetCommandLineOption("c"))
+                if (szOptionValue = GetCommandLineOption("c"))
                 {
                     CCommandFuncs::Connect(szOptionValue);
                 }
             }
         }
 
-        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;
         }
     }
 
@@ -1847,6 +1836,9 @@ void CCore::RecalculateFrameRateLimit(uint uiServerFrameRateLimit, bool bLogToCo
     if ((m_uiFrameRateLimit == 0 || uiClientScriptRate < m_uiFrameRateLimit) && uiClientScriptRate > 0)
         m_uiFrameRateLimit = uiClientScriptRate;
 
+    if (!IsConnected())
+        m_uiFrameRateLimit = m_CurrentRefreshRate;
+
     // Removes Limiter from Frame Graph if limit is zero and skips frame limit
     if (m_uiFrameRateLimit == 0)
     {
@@ -1873,6 +1865,12 @@ void CCore::SetClientScriptFrameRateLimit(uint uiClientScriptFrameRateLimit)
     RecalculateFrameRateLimit(-1, false);
 }
 
+void CCore::SetCurrentRefreshRate(uint value)
+{
+    m_CurrentRefreshRate = value;
+    RecalculateFrameRateLimit(-1, false);
+}
+
 //
 // Make sure the frame rate limit has been applied since the last call
 //
@@ -1933,7 +1931,7 @@ void CCore::ApplyQueuedFrameRateLimit()
             double dSpare = dTargetTimeToUse - m_FrameRateTimer.Get();
             if (dSpare <= 0.0)
                 break;
-            if (dSpare >= 2.0)
+            if (dSpare >= 10.0)
                 Sleep(1);
         }
         m_FrameRateTimer.Reset();
@@ -2195,8 +2193,9 @@ void CCore::HandleIdlePulse()
         DoPreFramePulse();
         DoPostFramePulse();
     }
-    if (m_pModManager->GetCurrentMod())
-        m_pModManager->GetCurrentMod()->IdleHandler();
+
+    if (m_pModManager->IsLoaded())
+        m_pModManager->GetClient()->IdleHandler();
 }
 
 //