Merge branch 'master' of https://github.com/multitheftauto/mtasa-blue

Author: Lpsd

.github/workflows/crowdin-auto-merge.yml

@@ -0,0 +1,31 @@
+name: Crowdin Auto-Merge
+
+on:
+  schedule:
+    - cron: '0 0 * * 5'  # This cron expression runs the workflow every Friday at midnight (UTC)
+  workflow_dispatch:
+
+jobs:
+  crowdin-auto-merge:
+    if: github.event.repository.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Git
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Auto-merge pull request
+        run: |
+          PR_NUMBER=$(gh pr list --repo ${{ github.repository }} --author 'MTABot' --base 'master' --head 'l10n/master' --state open --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --squash --repo ${{ github.repository }} --admin --subject "New Crowdin updates (PR #$PR_NUMBER)" --body ""
+            git push origin --delete l10n/master
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dockerimage.yaml

@@ -26,6 +26,7 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4

.github/workflows/rebuild-pots.yaml

@@ -4,6 +4,7 @@ on: [push, workflow_dispatch]
 
 jobs:
   test:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -23,6 +24,7 @@ jobs:
         run: pytest "utils/localization/tests"
         shell: bash -l {0}
   rebuild-pots:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     needs: test
     steps:

.github/workflows/stale.yaml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   stale:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: multitheftauto/stale-action@v3.0.0

.github/workflows/sync-master-to-maetro.yaml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   sync-master-to-maetro:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -416,3 +416,4 @@ utils/DXFiles/
 !*.dll
 !*.exe
 utils/vswhere.exe
+*.generated.h

Client/core/CChat.cpp

@@ -650,7 +650,29 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
 
             // If the input isn't empty and isn't identical to the previous entry in history, add it to the history
             if (!m_strInputText.empty() && (m_pInputHistory->Empty() || m_pInputHistory->GetLast() != m_strInputText))
-                m_pInputHistory->Add(m_strInputText);
+            {
+                if (m_strCommand.empty() && m_strInputText[0] != '/')
+                {
+                    // If the input is not a command, store it
+                    m_pInputHistory->Add(m_strInputText);
+                }
+                else if (m_strCommand.compare("login") != 0)
+                {
+                    // If the input is a command, check that it isn't the 'login' command, if it is censor it
+                    char szInput[256];
+                    unsigned int uiLength = sizeof(szInput) - 1;
+
+                    strncpy(szInput, m_strInputText.c_str() + 1, uiLength);
+                    szInput[uiLength] = '\0';
+
+                    const char* szCommand = strtok(szInput, " ");
+                    
+                    if (szCommand && (strcmp(szCommand, "login") != 0))
+                        m_pInputHistory->Add(m_strInputText);
+                    else if ((m_pInputHistory->Empty() || m_pInputHistory->GetLast() != std::string("/login")))
+                        m_pInputHistory->Add("/login");
+                }
+            }
 
             SetInputVisible(false);
 

Client/core/CCore.cpp

@@ -1233,71 +1233,51 @@ void CCore::DoPostFramePulse()
         m_pGUI->SelectInputHandlers(INPUT_CORE);
     }
 
-    if (m_pGame->GetSystemState() == 5)            // GS_INIT_ONCE
-    {
-        WatchDogCompletedSection("L2");            // gta_sa.set seems ok
-        WatchDogCompletedSection("L3");            // No hang on startup
-    }
-
     // This is the first frame in the menu?
     if (m_pGame->GetSystemState() == 7)            // GS_FRONTEND
     {
-        // Wait 250 frames more than the time it took to get status 7 (fade-out time)
-        static short WaitForMenu = 0;
+        if (m_bFirstFrame)
+        {
+            m_bFirstFrame = false;
 
-        // Do crash dump encryption while the credit screen is displayed
-        if (WaitForMenu == 0)
+            WatchDogCompletedSection("L2");            // gta_sa.set seems ok
+            WatchDogCompletedSection("L3");            // No hang on startup
             HandleCrashDumpEncryption();
 
-        // Cope with early finish
-        if (m_pGame->HasCreditScreenFadedOut())
-            WaitForMenu = 250;
+            // Disable vsync while it's all dark
+            m_pGame->DisableVSync();
 
-        if (WaitForMenu >= 250)
-        {
-            if (m_bFirstFrame)
+            // Parse the command line
+            // Does it begin with mtasa://?
+            if (m_szCommandLineArgs && strnicmp(m_szCommandLineArgs, "mtasa://", 8) == 0)
             {
-                m_bFirstFrame = false;
-
-                // Disable vsync while it's all dark
-                m_pGame->DisableVSync();
-
-                // Parse the command line
-                // Does it begin with mtasa://?
-                if (m_szCommandLineArgs && strnicmp(m_szCommandLineArgs, "mtasa://", 8) == 0)
+                SString strArguments = GetConnectCommandFromURI(m_szCommandLineArgs);
+                // Run the connect command
+                if (strArguments.length() > 0 && !m_pCommands->Execute(strArguments))
                 {
-                    SString strArguments = GetConnectCommandFromURI(m_szCommandLineArgs);
-                    // Run the connect command
-                    if (strArguments.length() > 0 && !m_pCommands->Execute(strArguments))
-                    {
-                        ShowMessageBox(_("Error") + _E("CC41"), _("Error executing URL"), MB_BUTTON_OK | MB_ICON_ERROR);
-                    }
+                    ShowMessageBox(_("Error") + _E("CC41"), _("Error executing URL"), MB_BUTTON_OK | MB_ICON_ERROR);
                 }
-                else
+            }
+            else
+            {
+                // We want to load a mod?
+                const char* szOptionValue;
+                if (szOptionValue = GetCommandLineOption("l"))
                 {
-                    // 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"))
+                    // Try to load the mod
+                    if (!m_pModManager->Load(szOptionValue, m_szCommandLineArgs))
                     {
-                        CCommandFuncs::Connect(szOptionValue);
+                        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"))
+                {
+                    CCommandFuncs::Connect(szOptionValue);
+                }
             }
         }
-        else
-        {
-            WaitForMenu++;
-        }
 
         if (m_bWaitToSetNick && GetLocalGUI()->GetMainMenu()->IsVisible() && !GetLocalGUI()->GetMainMenu()->IsFading())
         {

Client/core/CGUI.cpp

@@ -158,7 +158,8 @@ void CLocalGUI::CreateWindows(bool bGameIsAlreadyLoaded)
     m_pLabelVersionTag->SetTextColor(255, 255, 255);
     m_pLabelVersionTag->SetZOrderingEnabled(false);
     m_pLabelVersionTag->MoveToBack();
-    m_pLabelVersionTag->SetVisible(false);
+    if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
+        m_pLabelVersionTag->SetAlwaysOnTop(true);
 
     // Create mainmenu
     m_pMainMenu = new CMainMenu(pGUI);
@@ -286,27 +287,6 @@ void CLocalGUI::Draw()
     // Update mainmenu stuff
     m_pMainMenu->Update();
 
-    // Make sure our version labels are always visible
-    static short WaitForMenu = 0;
-
-    // Cope with early finish
-    if (pGame->HasCreditScreenFadedOut())
-        WaitForMenu = 250;
-
-    if (SystemState == 7 || SystemState == 9)
-    {
-        if (WaitForMenu < 250)
-        {
-            WaitForMenu++;
-        }
-        else
-        {
-            m_pLabelVersionTag->SetVisible(true);
-            if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
-                m_pLabelVersionTag->SetAlwaysOnTop(true);
-        }
-    }
-
     // If we're ingame, make sure the chatbox is drawn
     bool bChatVisible = (SystemState == 9 /* GS_INGAME */ && m_pMainMenu->GetIsIngame() && m_bChatboxVisible && !CCore::GetSingleton().IsOfflineMod());
     if (m_pChat->IsVisible() != bChatVisible)

Client/core/CLocalization.cpp

@@ -15,6 +15,14 @@
 // TRANSLATORS: Replace with your language native name
 #define NATIVE_LANGUAGE_NAME _td("English")
 
+struct NativeLanguageName
+{
+    std::string locale;
+    std::string name;
+} g_nativeLanguageNames[] = {
+    #include "languages.generated.h"
+};
+
 CLocalization::CLocalization(const SString& strLocale, const SString& strLocalePath)
 {
     // Set log callbacks so we can record problems
@@ -95,12 +103,23 @@ CLanguage* CLocalization::GetLanguage(SString strLocale)
 SString CLocalization::GetLanguageNativeName(SString strLocale)
 {
     strLocale = ValidateLocale(strLocale);
+
+    // Try to find the native language name in our sorted compile-time array first, using binary search.
+    auto begin = g_nativeLanguageNames;
+    auto end = g_nativeLanguageNames + _countof(g_nativeLanguageNames);
+    auto iter = std::lower_bound(begin, end, strLocale, [](const NativeLanguageName& a, const std::string& b) { return a.locale < b; });
+
+    if (iter != end && iter->locale == strLocale)
+        return iter->name;
+
+    // If not found, we fall back to the loading the language file and using the name from there.
     SString strNativeName = GetLanguage(strLocale)->Translate(NATIVE_LANGUAGE_NAME);
     if (strNativeName == "English" && strLocale != "en_US")
     {
         // If native name not available, use English version
         strNativeName = GetLanguage(strLocale)->GetName();
     }
+
     return strNativeName;
 }