Merge pull request #1091 from PTemuri/vehicle_size_optimization

Pack Vehicle and StreamInVehicle more tightly

Author: AmyrAhmady

Server/Components/Vehicles/vehicle.hpp

@@ -48,22 +48,22 @@ class Vehicle final : public IVehicle, public PoolIDProvider, public NoCopy
 	uint8_t landingGear = 1;
 	bool respawning = false;
 	bool detaching = false;
+	bool beenOccupied = false;
 	FlatHashSet<IPlayer*> passengers;
 	HybridString<16> numberPlate = StringView("XYZSR998");
 	uint8_t objective;
 	uint8_t doorsLocked;
+	uint8_t sirenState = 0;
 	VehicleDeathData deathData;
 	TimePoint timeOfSpawn;
 	TimePoint lastOccupiedChange;
-	bool beenOccupied = false;
 	Vector3 velocity = Vector3(0.0f, 0.0f, 0.0f);
 	Vector3 angularVelocity = Vector3(0.0f, 0.0f, 0.0f);
 	TimePoint trailerUpdateTime;
 	Vehicle* trailer = nullptr;
 	Vehicle* cab = nullptr;
 	StaticArray<IVehicle*, MAX_VEHICLE_CARRIAGES> carriages;
 	VehicleParams params;
-	uint8_t sirenState = 0;
 	uint32_t hydraThrustAngle = 0;
 	float trainSpeed = 0.0f;
 	int lastDriverPoolID = INVALID_PLAYER_ID;

Shared/NetCode/vehicle.hpp

@@ -111,15 +111,15 @@ namespace RPC
 		float Angle;
 		uint8_t Colour1;
 		uint8_t Colour2;
-		float Health;
 		uint8_t Interior;
+		uint8_t Paintjob;
+		float Health;
 		uint32_t DoorDamage;
 		uint32_t PanelDamage;
 		uint8_t LightDamage;
 		uint8_t TyreDamage;
 		uint8_t Siren;
 		StaticArray<int, MAX_VEHICLE_COMPONENT_SLOT_IN_RPC> Mods;
-		uint8_t Paintjob;
 		int32_t BodyColour1;
 		int32_t BodyColour2;