From 7349ab041d90437df70f15e27feef287cbaef133 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sat, 24 Sep 2022 06:12:30 -0500 Subject: [PATCH] Setup cruise control stuff (unfinished) --- scripts/client/event.js | 10 ++++++++-- scripts/client/main.js | 3 +++ scripts/client/vehicle.js | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/client/event.js b/scripts/client/event.js index c16408be..c96197af 100644 --- a/scripts/client/event.js +++ b/scripts/client/event.js @@ -167,6 +167,9 @@ function onPedExitedVehicle(event, ped, vehicle, seat) { //logToConsole(LOG_DEBUG, `[AGRP.Event] Local player exited vehicle`); //sendNetworkEventToServer("agrp.onPlayerExitVehicle", getVehicleForNetworkEvent(vehicle), seat); + cruiseControlEnabled = false; + cruiseControlSpeed = 0.0; + if (localPlayer != null) { if (ped == localPlayer) { if (areServerElementsSupported()) { @@ -190,7 +193,7 @@ function onPedExitingVehicle(event, ped, vehicle, seat) { if (localPlayer != null) { if (ped == localPlayer) { - cruiseControl = false; + cruiseControlEnabled = false; cruiseControlSpeed = 0.0; } } @@ -202,12 +205,15 @@ function onPedEnteredVehicle(event, ped, vehicle, seat) { logToConsole(LOG_DEBUG, `[AGRP.Event] Ped entered vehicle`); //sendNetworkEventToServer("agrp.onPlayerEnterVehicle", getVehicleForNetworkEvent(vehicle), seat); + cruiseControlEnabled = false; + cruiseControlSpeed = 0.0; if (localPlayer != null) { if (ped == localPlayer) { if (areServerElementsSupported()) { if (inVehicleSeat == 0) { - //setVehicleEngine(vehicle.id, false); + setVehicleEngine(vehicle.id, false); + //setLocalPlayerControlState(false, false); if (!inVehicle.engine) { parkedVehiclePosition = inVehicle.position; parkedVehicleHeading = inVehicle.heading; diff --git a/scripts/client/main.js b/scripts/client/main.js index d6c0da81..7e81b061 100644 --- a/scripts/client/main.js +++ b/scripts/client/main.js @@ -100,4 +100,7 @@ let currencyString = "${AMOUNT}"; let mapChangeWarning = false; +let cruiseControlEnabled = false; +let cruiseControlSpeed = 0.0; + // =========================================================================== diff --git a/scripts/client/vehicle.js b/scripts/client/vehicle.js index d4067d2f..a9268d6c 100644 --- a/scripts/client/vehicle.js +++ b/scripts/client/vehicle.js @@ -136,7 +136,7 @@ function toggleLocalVehicleCruiseControl() { return false; } - cruiseControl = !cruiseControl; + cruiseControlEnabled = !cruiseControlEnabled; cruiseControlSpeed = getVehicleSpeed(vehicle); }