From 36d6cd507eb3904623ba355c636f1109095bcdf7 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 30 May 2022 07:37:15 -0500
Subject: [PATCH] Fix CS veh stuff

---
 scripts/client/vehicle.js | 75 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/scripts/client/vehicle.js b/scripts/client/vehicle.js
index 700ff7be..3011f195 100644
--- a/scripts/client/vehicle.js
+++ b/scripts/client/vehicle.js
@@ -7,11 +7,56 @@
 // TYPE: Client (JavaScript)
 // ===========================================================================
 
-function receiveVehicleFromServer(vehicleId, position, model, colour1, colour2, colour3 = 0, colour4 = 0) {
-	logToConsole(LOG_DEBUG, `[VRR.Job] Received vehicle ${vehicleId} (${getVehicleNameFromModel(model, getGame())}) from server`);
+class VehicleData {
+	constructor(vehicleId, model, position, heading, colour1, colour2, colour3, colour4, locked, lights, engine, licensePlate) {
+		this.index = -1;
+		this.vehicleId = vehicleId;
+		this.model = model;
+		this.position = position;
+		this.heading = heading;
+		this.colour1 = colour1;
+		this.colour2 = colour2;
+		this.colour3 = colour3;
+		this.colour4 = colour4;
+		this.pickupModel = pickupModel;
+		this.locked = locked;
+		this.lights = lights;
+		this.engine = engine;
+		this.licensePlate = licensePlate;
+		this.ivNetworkId = -1;
+	}
+}
 
-	if(getGame() == VRR_GAME_GTA_IV) {
+// ===========================================================================
 
+function receiveVehicleFromServer(vehicleId, position, model, colour1, colour2, colour3 = 0, colour4 = 0, locked = false, lights = false, engine = false, licensePlate = "") {
+	logToConsole(LOG_DEBUG, `[VRR.Vehicle] Received vehicle ${vehicleId} (${getVehicleNameFromModel(model, getGame())}) from server`);
+
+	if(getGame() != VRR_GAME_GTA_IV) {
+		return false;
+	}
+
+	if(getVehicleData(vehicleId) != false) {
+		let vehicleData = getVehicleData(vehicleId);
+		//vehicleData.position = position;
+		//vehicleData.heading = heading;
+		//vehicleData.model
+		vehicleData.colour1 = colour1;
+		vehicleData.colour2 = colour2;
+		vehicleData.colour3 = colour3;
+		vehicleData.colour4 = colour4;
+		vehicleData.engine = engine;
+		vehicleData.lights = lights;
+		vehicleData.locked = locked;
+		vehicleData.licensePlate = "";
+
+		let vehicle = natives.getVehicleFromNetworkId(vehicleId.ivNetworkId);
+	} else {
+		//logToConsole(LOG_DEBUG, `[VRR.Vehicle] Vehicle ${vehicleId} doesn't exist. Adding ...`);
+		//let tempVehicleData = new VehicleData(vehicleId, name, position, blipModel, pickupModel);
+
+		//vehicles.push(tempVehicleData);
+		//setAllJobDataIndexes();
 	}
 }
 
@@ -59,4 +104,28 @@ function setVehiclePurchaseState(state, vehicleId, position) {
 	vehiclePurchasePosition = position;
 }
 
+// ===========================================================================
+
+/**
+ * @param {number} vehicleId - The ID of the job (initially provided by server)
+ * @return {VehicleData} The vehicle's data (class instance)
+ */
+ function getVehicleData(vehicleId) {
+	for(let i in getServerData().vehicles) {
+		if(getServerData().vehicles[i].vehicleId == vehicleId) {
+			return getServerData().vehicles[i];
+		}
+	}
+
+	return false;
+}
+
+// ===========================================================================
+
+function setAllVehicleDataIndexes() {
+	for(let i in getServerData().vehicles) {
+		getServerData().vehicles[i].index = i;
+	}
+}
+
 // ===========================================================================
\ No newline at end of file