Merge branch 'master' into bugfix/camera_fov_modes

Author: FileEX

Client/core/CGUI.cpp

@@ -158,7 +158,7 @@ void CLocalGUI::CreateWindows(bool bGameIsAlreadyLoaded)
     m_pLabelVersionTag->SetTextColor(255, 255, 255);
     m_pLabelVersionTag->SetZOrderingEnabled(false);
     m_pLabelVersionTag->MoveToBack();
-    if (MTASA_VERSION_TYPE < VERSION_TYPE_RELEASE)
+    if (MTASA_VERSION_TYPE < VERSION_TYPE_UNTESTED)
         m_pLabelVersionTag->SetAlwaysOnTop(true);
 
     // Create mainmenu

Client/game_sa/CPedSA.h

@@ -261,7 +261,7 @@ class CPedSAInterface : public CPhysicalSAInterface
     int                              unk_52C;
 
     int                              pedState;
-    int                              moveState;
+    PedMoveState::Enum               moveState;
     int                              swimmingMoveState;
 
     int                              unk_53C;
@@ -276,10 +276,10 @@ class CPedSAInterface : public CPhysicalSAInterface
     float                            fRotationSpeed;
     float                            fMoveAnim;
 
-    CEntitySAInterface*              pContactEntity;
+    CEntitySAInterface*              pContactEntity; // m_standingOnEntity
     CVector                          unk_56C;
     CVector                          unk_578;
-    CEntitySAInterface*              pLastContactEntity;
+    CEntitySAInterface*              pLastContactEntity; // m_contactEntity
 
     CVehicleSAInterface*             pLastVehicle;
     CVehicleSAInterface*             pVehicle;
@@ -421,8 +421,9 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
     void           SetFightingStyle(eFightingStyle style, std::uint8_t styleExtra = 6) override;
 
     CEntity* GetContactEntity() const override;
+    bool     IsStandingOnEntity() const override { return GetPedInterface()->pContactEntity != nullptr; };
 
-    int GetRunState() const override { return GetPedInterface()->moveState; }
+    PedMoveState::Enum GetMoveState() const override { return GetPedInterface()->moveState; }
 
     bool GetCanBeShotInVehicle() const override{ return GetPedInterface()->pedFlags.bCanBeShotInVehicle; }
     bool GetTestForShotInVehicle() const override { return GetPedInterface()->pedFlags.bTestForShotInVehicle; }

Client/launch/Multi Theft Auto.manifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:v3="urn:schemas-microsoft-com:asm.v3">
-    <assemblyIdentity type="win32" version="1.6.0.0" processorArchitecture="*" name="Multi Theft Auto" />
+    <assemblyIdentity type="win32" version="1.7.0.0" processorArchitecture="*" name="Multi Theft Auto" />
 
     <v3:application>
         <windowsSettings>

Client/launch/NEU/.gitattributes

@@ -0,0 +1 @@
+*.xml diff working-tree-encoding=UTF-16 eol=crlf

Client/launch/NEU/Multi Theft Auto.gdf.xml

@@ -71,8 +71,8 @@ IDI_ICON1               ICON                    "resource\\mtaicon.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,7,0,0
+ PRODUCTVERSION 1,7,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -89,10 +89,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Multi Theft Auto"
             VALUE "FileDescription", "Multi Theft Auto Launcher"
-            VALUE "FileVersion", "1.6.0.0"
-            VALUE "LegalCopyright", "(C) 2003 - 2023 Multi Theft Auto"
+            VALUE "FileVersion", "1.7.0.0"
+            VALUE "LegalCopyright", "(C) 2003 - 2025 Multi Theft Auto"
             VALUE "ProductName", "MTA San Andreas"
-            VALUE "ProductVersion", "1.6.0.0"
+            VALUE "ProductVersion", "1.7.0.0"
         END
     END
     BLOCK "VarFileInfo"

Client/launch/launch.rc

@@ -432,10 +432,10 @@ SString CInstallManager::_ShowCrashFailDialog()
         strMessage += strReason;
     }
 
-    const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");
-    const int     exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");
+    // const SString moduleName = GetApplicationSetting("diagnostics", "last-crash-module");
+    const int exceptionCode = GetApplicationSettingInt("diagnostics", "last-crash-code");
 
-    if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM && moduleName.EndsWithI("\\kernelbase.dll"))
+    if (exceptionCode == CUSTOM_EXCEPTION_CODE_OOM)
     {
         strMessage += '\n';
         strMessage += _("** Out of memory - this crash was caused by insufficient free or fragmented memory. **");

Client/loader/CInstallManager.cpp

@@ -977,7 +977,7 @@ void CheckDataFiles()
 //////////////////////////////////////////////////////////
 void CheckLibVersions()
 {
-#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
+#if MTASA_VERSION_TYPE >= VERSION_TYPE_UNTESTED
 
     const char* moduleList[] = {"MTA\\loader.dll",
                                 "MTA\\cgui.dll",

Client/loader/MainFunctions.cpp

@@ -33,7 +33,8 @@ int CClient::ClientInitialize(const char* szArguments, CCoreInterface* pCore)
     // Make public client test builds expire
     if (GetDaysUntilExpire() < -1)
     {
-        MessageBox(NULL, _("This version has expired."), "MTA: San Andreas " MTA_DM_BUILDTAG_LONG + _E("CD64"), MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
+        MessageBoxA(NULL, _("This version has expired."), SStringX("MTA: San Andreas " MTA_DM_BUILDTAG_LONG) + _E("CD64"),
+                    MB_OK | MB_ICONEXCLAMATION | MB_TOPMOST);
         TerminateProcess(GetCurrentProcess(), 1);
     }
 #endif

Client/mods/deathmatch/CClient.cpp

@@ -26,7 +26,7 @@ class CClientColTube final : public CClientColShape
     float GetRadius() { return m_fRadius; };
     void  SetRadius(float fRadius)
     {
-        m_fRadius = fRadius;
+        m_fRadius = (fRadius / 2.0f) + 0.15f;
         SizeChanged();
     };
     float GetHeight() { return m_fHeight; };