Synchronize changes from 1.6 master branch [ci skip]

47bc53f Remove outdated bitstream checks
d302d3c Remove outdated community account handling
fe761e5 Remove unused jump section in HOOK_CPlantMgr_Render
3707b53 Disable empty CResourceChecker data arrays
859e6ce Remove outdated bitstream checks
25e07c4 Remove remaining minimum client checks
764f5ab Set version to 1.6.1
a79a764 Update client en_US pot

Author: github-actions[bot]

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.6.1.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,6,1,0
+ PRODUCTVERSION 1,6,1,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.6.1.0"
+            VALUE "LegalCopyright", "(C) 2003 - 2025 Multi Theft Auto"
             VALUE "ProductName", "MTA San Andreas"
-            VALUE "ProductVersion", "1.6.0.0"
+            VALUE "ProductVersion", "1.6.1.0"
         END
     END
     BLOCK "VarFileInfo"

Client/launch/launch.rc

@@ -703,16 +703,6 @@ bool CClientGame::StartGame(const char* szNick, const char* szPassword, eServerT
             pBitStream->Write(strTemp.c_str(), MAX_PLAYER_NICK_LENGTH);
             pBitStream->Write(reinterpret_cast<const char*>(Password.data), sizeof(MD5));
 
-            // Append community information (Removed)
-            std::string strUser;
-            pBitStream->Write(strUser.c_str(), MAX_SERIAL_LENGTH);
-
-            // Send an empty string if server still has old Discord implementation (#2499)
-            if (g_pNet->CanServerBitStream(eBitStreamVersion::Discord_InitialImplementation) && !g_pNet->CanServerBitStream(eBitStreamVersion::Discord_Cleanup))
-            {
-                pBitStream->WriteString<uchar>("");
-            }
-
             // Send the packet as joindata
             g_pNet->SendPacket(PACKET_ID_PLAYER_JOINDATA, pBitStream, PACKET_PRIORITY_HIGH, PACKET_RELIABILITY_RELIABLE_ORDERED);
             g_pNet->DeallocateNetBitStream(pBitStream);
@@ -1829,12 +1819,10 @@ void CClientGame::UpdatePlayerWeapons()
             SWeaponSlotSync        slot;
 
             // Always send bit in case server is not in sync
-            if ((BitStream.Version() >= 0x44 && m_lastWeaponSlot == WEAPONSLOT_TYPE_THROWN) || BitStream.Version() >= 0x4D)
             {
                 CWeapon* pLastWeapon = m_pLocalPlayer->GetWeapon(m_lastWeaponSlot);
                 if (pLastWeapon && pLastWeapon->GetAmmoTotal() == 0 &&
-                    (m_lastWeaponSlot == WEAPONSLOT_TYPE_THROWN ||
-                     (BitStream.Version() >= 0x5A && (m_lastWeaponSlot == WEAPONSLOT_TYPE_HEAVY || m_lastWeaponSlot == WEAPONSLOT_TYPE_SPECIAL))))
+                    (m_lastWeaponSlot == WEAPONSLOT_TYPE_THROWN || m_lastWeaponSlot == WEAPONSLOT_TYPE_HEAVY || m_lastWeaponSlot == WEAPONSLOT_TYPE_SPECIAL))
                     BitStream.WriteBit(true);
                 else
                     BitStream.WriteBit(false);
@@ -5281,18 +5269,15 @@ void CClientGame::SendExplosionSync(const CVector& vecPosition, eExplosionType T
 
             // Because we use this packet to notify the server of blown vehicles,
             // we include a bit, whether the vehicle was blown without an explosion
-            if (pBitStream->Can(eBitStreamVersion::VehicleBlowStateSupport))
+            if (pOrigin->GetType() == CCLIENTVEHICLE)
             {
-                if (pOrigin->GetType() == CCLIENTVEHICLE)
-                {
-                    auto vehicle = reinterpret_cast<CClientVehicle*>(pOrigin);
-                    pBitStream->WriteBit(1);
-                    pBitStream->WriteBit(vehicleBlowState.value_or(vehicle->GetBlowState()) == VehicleBlowState::BLOWN);
-                }
-                else
-                {
-                    pBitStream->WriteBit(0);
-                }
+                auto vehicle = reinterpret_cast<CClientVehicle*>(pOrigin);
+                pBitStream->WriteBit(1);
+                pBitStream->WriteBit(vehicleBlowState.value_or(vehicle->GetBlowState()) == VehicleBlowState::BLOWN);
+            }
+            else
+            {
+                pBitStream->WriteBit(0);
             }
 
             // Convert position

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6477,12 +6477,6 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
         return false;
     }
 
-    // Check the server is compatible if we are a ped
-    if (!IsLocalPlayer() && !g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-    {
-        return false;
-    }
-
     // Are we already inside a vehicle
     if (GetOccupiedVehicle())
     {
@@ -6651,11 +6645,7 @@ bool CClientPed::EnterVehicle(CClientVehicle* pVehicle, bool bPassenger)
         return false;
     }
 
-    // Write the ped ID to it if server supports it
-    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-    {
-        pBitStream->Write(GetID());
-    }
+    pBitStream->Write(GetID());
 
     // Write the vehicle id to it and that we're requesting to get into it
     pBitStream->Write(pVehicle->GetID());
@@ -6718,12 +6708,6 @@ bool CClientPed::ExitVehicle()
         return false;
     }
 
-    // Check the server is compatible if we are a ped
-    if (!IsLocalPlayer() && !g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-    {
-        return false;
-    }
-
     // Are we already sending an in/out request or not allowed to create a new in/out?
     if (m_bNoNewVehicleTask                                  // Are we permitted to even enter a vehicle?
         || m_VehicleInOutID != INVALID_ELEMENT_ID            // Make sure we're not already processing a vehicle enter (would refer to valid ID if we were)
@@ -6784,11 +6768,7 @@ bool CClientPed::ExitVehicle()
         return false;
     }
 
-    // Write the ped ID to it if server supports it
-    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-    {
-        pBitStream->Write(GetID());
-    }
+    pBitStream->Write(GetID());
 
     // Write the vehicle id to it and that we're requesting to get out of it
     pBitStream->Write(pOccupiedVehicle->GetID());
@@ -6916,10 +6896,7 @@ void CClientPed::UpdateVehicleInOut()
             if (pBitStream)
             {
                 // Write the ped ID to it
-                if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-                {
-                    pBitStream->Write(GetID());
-                }
+                pBitStream->Write(GetID());
 
                 // Write the car id and the action id (enter complete)
                 pBitStream->Write(m_VehicleInOutID);
@@ -6969,10 +6946,7 @@ void CClientPed::UpdateVehicleInOut()
                 if (pBitStream)
                 {
                     // Write the ped or player ID to it
-                    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-                    {
-                        pBitStream->Write(GetID());
-                    }
+                    pBitStream->Write(GetID());
 
                     // Write the car id and the action id (enter complete)
                     pBitStream->Write(m_VehicleInOutID);
@@ -7016,10 +6990,7 @@ void CClientPed::UpdateVehicleInOut()
                 if (pBitStream)
                 {
                     // Write the ped or player ID to it
-                    if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-                    {
-                        pBitStream->Write(GetID());
-                    }
+                    pBitStream->Write(GetID());
 
                     // Write the car id and the action id (enter complete)
                     pBitStream->Write(m_VehicleInOutID);
@@ -7131,10 +7102,7 @@ void CClientPed::UpdateVehicleInOut()
             return;
 
         // Write the ped or player ID to it
-        if (g_pNet->CanServerBitStream(eBitStreamVersion::PedEnterExit))
-        {
-            pBitStream->Write(GetID());
-        }
+        pBitStream->Write(GetID());
 
         // Vehicle id
         pBitStream->Write(pOccupiedVehicle->GetID());

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -1118,9 +1118,7 @@ void CNetAPI::WritePlayerPuresync(CClientPlayer* pPlayerModel, NetBitStreamInter
     flags.data.bHasAWeapon = (pPlayerWeapon != NULL);
     flags.data.bSyncingVelocity = (!flags.data.bIsOnGround || (pPlayerModel->GetPlayerSyncCount() % 4) == 0);
     flags.data.bStealthAiming = (pPlayerModel->IsStealthAiming() == true);
-
-    if (BitStream.Can(eBitStreamVersion::IsPedReloadingWeapon))
-        flags.data2.isReloadingWeapon = (pPlayerModel->IsReloadingWeapon() == true);
+    flags.data.isReloadingWeapon = (pPlayerModel->IsReloadingWeapon() == true);
 
     if (pPlayerWeapon->GetSlot() > 15)
         flags.data.bHasAWeapon = false;
@@ -1289,9 +1287,7 @@ void CNetAPI::ReadVehiclePuresync(CClientPlayer* pPlayer, CClientVehicle* pVehic
     // differs from the local one (#8800)
     int iModelID = pVehicle->GetModel();
     int iRemoteModelID = iModelID;
-
-    if (BitStream.Version() >= 0x05F)
-        BitStream.Read(iRemoteModelID);
+    BitStream.Read(iRemoteModelID);
 
     eClientVehicleType remoteVehicleType = CClientVehicleManager::GetVehicleType(iRemoteModelID);
     eClientVehicleType vehicleType = pVehicle->GetVehicleType();
@@ -1480,7 +1476,7 @@ void CNetAPI::ReadVehiclePuresync(CClientPlayer* pPlayer, CClientVehicle* pVehic
             }
 
             // Read out the weapon ammo
-            SWeaponAmmoSync ammo(ucCurrentWeapon, BitStream.Version() >= 0x44, true);
+            SWeaponAmmoSync ammo(ucCurrentWeapon, true, true);
             BitStream.Read(&ammo);
             unsigned short usWeaponAmmo = ammo.data.usAmmoInClip;
 
@@ -1489,7 +1485,7 @@ void CNetAPI::ReadVehiclePuresync(CClientPlayer* pPlayer, CClientVehicle* pVehic
                 CWeapon* pPlayerWeapon = pPlayer->GiveWeapon(static_cast<eWeaponType>(ucCurrentWeapon), usWeaponAmmo, true);
                 if (pPlayerWeapon)
                 {
-                    pPlayerWeapon->SetAmmoTotal(BitStream.Version() >= 0x44 ? ammo.data.usTotalAmmo : 9999);
+                    pPlayerWeapon->SetAmmoTotal(ammo.data.usTotalAmmo);
                     pPlayerWeapon->SetAmmoInClip(usWeaponAmmo);
                 }
             }
@@ -1545,8 +1541,7 @@ void CNetAPI::ReadVehiclePuresync(CClientPlayer* pPlayer, CClientVehicle* pVehic
 
     pPlayer->SetControllerState(ControllerState);
 
-    if (BitStream.Can(eBitStreamVersion::SetElementOnFire))
-        pVehicle->SetOnFire(BitStream.ReadBit());
+    pVehicle->SetOnFire(BitStream.ReadBit());
 
     // Remember now as the last puresync time
     CVector vecPosition;
@@ -1574,8 +1569,7 @@ void CNetAPI::WriteVehiclePuresync(CClientPed* pPlayerModel, CClientVehicle* pVe
         iModelID = pVehicle->GetModelInfo()->GetParentID();
 
     // Write the clientside model
-    if (BitStream.Version() >= 0x05F)
-        BitStream.Write(iModelID);
+    BitStream.Write(iModelID);
 
     // Grab the vehicle position
     CVector vecPosition;
@@ -1667,38 +1661,6 @@ void CNetAPI::WriteVehiclePuresync(CClientPed* pPlayerModel, CClientVehicle* pVe
         BitStream.WriteBit(false);
     }
 
-    // Update Damage Info if changed
-    if (BitStream.Version() >= 0x047)
-    {
-        if (!g_pClientGame->GetDamageSent())
-        {
-            g_pClientGame->SetDamageSent(true);
-
-            ElementID DamagerID = g_pClientGame->GetDamagerID();
-            if (DamagerID != RESERVED_ELEMENT_ID)
-            {
-                BitStream.WriteBit(true);
-                BitStream.Write(DamagerID);
-
-                SWeaponTypeSync weaponType;
-                weaponType.data.ucWeaponType = g_pClientGame->GetDamageWeapon();
-                BitStream.Write(&weaponType);
-
-                SBodypartSync bodypart;
-                bodypart.data.uiBodypart = g_pClientGame->GetDamageBodyPiece();
-                BitStream.Write(&bodypart);
-            }
-            else
-            {
-                BitStream.WriteBit(false);
-            }
-        }
-        else
-        {
-            BitStream.WriteBit(false);
-        }
-    }
-
     // Player health sync (scaled from 0.0f-200.0f to 0-255 to save three bytes).
     // Scale goes up to 200.0f because having max stats gives you the double of health.
     SPlayerHealthSync health;
@@ -1741,7 +1703,7 @@ void CNetAPI::WriteVehiclePuresync(CClientPed* pPlayerModel, CClientVehicle* pVe
         if (flags.data.bIsDoingGangDriveby && CWeaponNames::DoesSlotHaveAmmo(uiSlot))
         {
             // Write the ammo states
-            SWeaponAmmoSync ammo(pPlayerWeapon->GetType(), BitStream.Version() >= 0x44, true);
+            SWeaponAmmoSync ammo(pPlayerWeapon->GetType(), true, true);
             ammo.data.usAmmoInClip = static_cast<unsigned short>(pPlayerWeapon->GetAmmoInClip());
             ammo.data.usTotalAmmo = static_cast<unsigned short>(pPlayerWeapon->GetAmmoTotal());
             BitStream.Write(&ammo);
@@ -1773,8 +1735,7 @@ void CNetAPI::WriteVehiclePuresync(CClientPed* pPlayerModel, CClientVehicle* pVe
         BitStream.WriteBit(ControllerState.RightShoulder2 != 0);
     }
 
-    if (BitStream.Can(eBitStreamVersion::SetElementOnFire))
-        BitStream.WriteBit(pVehicle->IsOnFire());
+    BitStream.WriteBit(pVehicle->IsOnFire());
 
     // Write the sent position to the interpolator
     AddInterpolation(vecPosition);
@@ -1786,19 +1747,19 @@ bool CNetAPI::ReadSmallKeysync(CControllerState& ControllerState, NetBitStreamIn
     if (!BitStream.Read(&keys))
         return false;
 
-    // Put the result into the controllerstate
-    ControllerState.LeftShoulder1 = 255 * keys.data.bLeftShoulder1;
-    ControllerState.RightShoulder1 = 255 * keys.data.bRightShoulder1;
     short sButtonSquare = 255 * keys.data.bButtonSquare;
     short sButtonCross = 255 * keys.data.bButtonCross;
-    if (BitStream.Can(eBitStreamVersion::AnalogControlSync_AccelBrakeReverse))
     {
         if (keys.data.ucButtonSquare != 0)
             sButtonSquare = (short)keys.data.ucButtonSquare;            // override controller state with analog data if present
 
         if (keys.data.ucButtonCross != 0)
             sButtonCross = (short)keys.data.ucButtonCross;            // override controller state with analog data if present
     }
+
+    // Put the result into the controllerstate
+    ControllerState.LeftShoulder1 = 255 * keys.data.bLeftShoulder1;
+    ControllerState.RightShoulder1 = 255 * keys.data.bRightShoulder1;
     ControllerState.ButtonSquare = sButtonSquare;
     ControllerState.ButtonCross = sButtonCross;
     ControllerState.ButtonCircle = 255 * keys.data.bButtonCircle;
@@ -1837,19 +1798,19 @@ bool CNetAPI::ReadFullKeysync(CControllerState& ControllerState, NetBitStreamInt
     if (!BitStream.Read(&keys))
         return false;
 
-    // Put the result into the controllerstate
-    ControllerState.LeftShoulder1 = 255 * keys.data.bLeftShoulder1;
-    ControllerState.RightShoulder1 = 255 * keys.data.bRightShoulder1;
     short sButtonSquare = 255 * keys.data.bButtonSquare;
     short sButtonCross = 255 * keys.data.bButtonCross;
-    if (BitStream.Can(eBitStreamVersion::AnalogControlSync_AccelBrakeReverse))
     {
         if (keys.data.ucButtonSquare != 0)
             sButtonSquare = (short)keys.data.ucButtonSquare;            // override controller state with analog data if present
 
         if (keys.data.ucButtonCross != 0)
             sButtonCross = (short)keys.data.ucButtonCross;            // override controller state with analog data if present
     }
+
+    // Put the result into the controllerstate
+    ControllerState.LeftShoulder1 = 255 * keys.data.bLeftShoulder1;
+    ControllerState.RightShoulder1 = 255 * keys.data.bRightShoulder1;
     ControllerState.ButtonSquare = sButtonSquare;
     ControllerState.ButtonCross = sButtonCross;
     ControllerState.ButtonCircle = 255 * keys.data.bButtonCircle;
@@ -1988,8 +1949,7 @@ void CNetAPI::WriteCameraSync(NetBitStreamInterface& BitStream)
 {
     CClientCamera* pCamera = m_pManager->GetCamera();
 
-    if (BitStream.Version() >= 0x05E)
-        BitStream.Write(pCamera->GetSyncTimeContext());
+    BitStream.Write(pCamera->GetSyncTimeContext());
 
     // Are we in fixed mode?
     bool bFixed = pCamera->IsInFixedMode();
@@ -2239,9 +2199,6 @@ void CNetAPI::ReadVehicleResync(CClientVehicle* pVehicle, NetBitStreamInterface&
 
 void CNetAPI::ReadVehiclePartsState(CClientVehicle* pVehicle, NetBitStreamInterface& BitStream)
 {
-    if (BitStream.Version() < 0x5D)
-        return;
-
     SVehicleDamageSyncMethodeB damage;
     BitStream.Read(&damage);
     bool flyingComponents = m_pVehicleManager->IsSpawnFlyingComponentEnabled();