Merge branch 'master' into fix/explosion-trigger-clientside

Author: Dutchman101

Client/game_sa/CPoolsSA.cpp

@@ -26,6 +26,7 @@
 #include "CWorldSA.h"
 
 #include "enums/VehicleClass.h"
+#include <new>
 
 extern CGameSA* pGame;
 
@@ -242,7 +243,7 @@ CObject* CPoolsSA::AddObject(CClientObject* pClientObject, DWORD dwModelID, bool
 
     if (m_objectPool.ulCount < MAX_OBJECTS)
     {
-        pObject = new CObjectSA(dwModelID, bBreakingDisabled);
+        pObject = new (std::nothrow) CObjectSA(dwModelID, bBreakingDisabled);
 
         if (pObject && AddObjectToPool(pClientObject, pObject))
         {

Client/loader/Dialogs.cpp

@@ -101,8 +101,8 @@ const SDialogItemInfo g_NoAvDialogItems[] = {
      _td("MTA could not detect an anti-virus on your PC.\n\n"
          "Viruses interfere with MTA and degrade your gameplay experience.\n\n"
          "Press 'Help' for more information.")},
-    {IDC_NOAV_OPT_SKIP, 0, _td("I have already installed an anti-virus")},
-    {IDC_NOAV_OPT_BOTNET, 0,
+    {IDC_NOAV_OPT_SKIP, 1, _td("I have already installed an anti-virus")},
+    {IDC_NOAV_OPT_BOTNET, 1,
      _td("I will not install an anti-virus.\n"
          "I want my PC to lag and be part of a botnet.")},
     {IDC_BUTTON_HELP, 0, dialogStringsHelp},
@@ -618,8 +618,12 @@ void ShowNoAvDialog(HINSTANCE hInstance, bool bEnableScaremongering)
         hwndNoAvDialog = CreateDialogW(hInstance, MAKEINTRESOURCEW(IDD_NOAV_DIALOG), 0, DialogProc);
         dassert((GetWindowLongW(hwndNoAvDialog, GWL_STYLE) & WS_VISIBLE) == 0);            // Should be Visible: False
         InitDialogStrings(hwndNoAvDialog, g_NoAvDialogItems);
-        ShowWindow(GetDlgItem(hwndNoAvDialog, IDC_NOAV_OPT_SKIP), bEnableScaremongering ? SW_HIDE : SW_SHOW);
-        ShowWindow(GetDlgItem(hwndNoAvDialog, IDC_NOAV_OPT_BOTNET), bEnableScaremongering ? SW_SHOW : SW_HIDE);
+        const int textSourceItemId = bEnableScaremongering ? IDC_NOAV_OPT_BOTNET : IDC_NOAV_OPT_SKIP;
+        {
+            wchar_t text[256] = {};
+            GetWindowTextW(GetDlgItem(hwndNoAvDialog, textSourceItemId), text, _countof(text));
+            SetWindowTextW(GetDlgItem(hwndNoAvDialog, IDC_CHECK_NOT_AGAIN), text);
+        }
     }
     ShowWindow(hwndNoAvDialog, SW_SHOW);            // Show after all changes are complete
     SetForegroundWindow(hwndNoAvDialog);

Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-08-08 18:21+0000\n"
+"POT-Creation-Date: 2025-08-11 18:27+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2832,11 +2832,11 @@ msgid ""
 "or try running the update with administrator rights."
 msgstr ""
 
-#: Client/loader/Install.cpp:852 Client/loader/Dialogs.cpp:689
+#: Client/loader/Install.cpp:852 Client/loader/Dialogs.cpp:693
 msgid "Installing update..."
 msgstr ""
 
-#: Client/loader/Install.cpp:934 Client/loader/Dialogs.cpp:697
+#: Client/loader/Install.cpp:934 Client/loader/Dialogs.cpp:701
 msgid "Extracting files..."
 msgstr ""
 
@@ -3099,19 +3099,19 @@ msgstr ""
 msgid "Error loading %s module! (%s)"
 msgstr ""
 
-#: Client/loader/Utils.cpp:1391 Client/loader/Dialogs.cpp:702
+#: Client/loader/Utils.cpp:1391 Client/loader/Dialogs.cpp:706
 msgid "Copying files..."
 msgstr ""
 
-#: Client/loader/Utils.cpp:1451 Client/loader/Dialogs.cpp:707
+#: Client/loader/Utils.cpp:1451 Client/loader/Dialogs.cpp:711
 msgid "Copy finished early. Everything OK."
 msgstr ""
 
-#: Client/loader/Utils.cpp:1457 Client/loader/Dialogs.cpp:712
+#: Client/loader/Utils.cpp:1457 Client/loader/Dialogs.cpp:716
 msgid "Finishing..."
 msgstr ""
 
-#: Client/loader/Utils.cpp:1459 Client/loader/Dialogs.cpp:716
+#: Client/loader/Utils.cpp:1459 Client/loader/Dialogs.cpp:720
 msgid "Done!"
 msgstr ""
 
@@ -3287,11 +3287,11 @@ msgid ""
 "I want my PC to lag and be part of a botnet."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:678
+#: Client/loader/Dialogs.cpp:682
 msgid "Searching for Grand Theft Auto San Andreas"
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:681
+#: Client/loader/Dialogs.cpp:685
 msgid "Please start Grand Theft Auto San Andreas"
 msgstr ""