Synchronize changes from 1.6 master branch [ci skip]

bb56667 Increase vehicle model id range in packet (PR #4324)

Author: github-actions[bot]

Client/mods/deathmatch/logic/CPacketHandler.cpp

@@ -3219,18 +3219,10 @@ void CPacketHandler::Packet_EntityAdd(NetBitStreamInterface& bitStream)
                     SRotationDegreesSync rotationDegrees(false);
                     bitStream.Read(&rotationDegrees);
 
-                    // Read out the vehicle value as a char, then convert
-                    unsigned char ucModel = 0xFF;
-                    bitStream.Read(ucModel);
-
-                    // The server appears to subtract 400 from the vehicle id before
-                    // sending it to us, as to allow the value to fit into an unsigned
-                    // char.
-                    //
-                    // Too bad this was never documented.
-                    //
-                    // --slush
-                    unsigned short usModel = ucModel + 400;
+                    // Read out the vehicle model
+                    std::uint16_t usModel = 0xFFFF;
+                    bitStream.Read(usModel);
+                    
                     if (!CClientVehicleManager::IsValidModel(usModel))
                     {
                         RaiseEntityAddError(39);

Server/mods/deathmatch/logic/packets/CEntityAddPacket.cpp

@@ -447,12 +447,7 @@ bool CEntityAddPacket::Write(NetBitStreamInterface& BitStream) const
                     BitStream.Write(&position);
                     BitStream.Write(&rotationDegrees);
 
-                    // Vehicle id as a char
-                    // I'm assuming the "-400" is for adjustment so that all car values can
-                    // fit into a char?  Why doesn't someone document this?
-                    //
-                    // --slush
-                    BitStream.Write(static_cast<unsigned char>(pVehicle->GetModel() - 400));
+                    BitStream.Write(static_cast<std::uint16_t>(pVehicle->GetModel()));
 
                     // Health
                     SVehicleHealthSync health;