hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear data option for clear wep util+dont freeze car

Browse Source
This commit is contained in:
Vortrex
2022-05-01 15:02:54 -05:00
parent c2bd523cca
commit 5273c954be
1 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
scripts/client/utilities.js
View File

@@ -314,12 +314,14 @@ function giveLocalPlayerWeapon(weaponId, ammo, active) {
// =========================================================================== // ===========================================================================
function clearLocalPlayerWeapons() { function clearLocalPlayerWeapons(clearData) {
logToConsole(LOG_DEBUG, `[VRR.Utilities] Clearing weapons`); logToConsole(LOG_DEBUG, `[VRR.Utilities] Clearing weapons`);
localPlayer.clearWeapons(); localPlayer.clearWeapons();
forceWeapon = 0; if(clearData == true) {
forceWeaponAmmo = 0; forceWeapon = 0;
forceWeaponClipAmmo = 0; forceWeaponAmmo = 0;
forceWeaponClipAmmo = 0;
}
} }
// =========================================================================== // ===========================================================================
@@ -358,15 +360,15 @@ function setLocalPlayerInterior(interior) {
if(!isGTAIV()) { if(!isGTAIV()) {
localPlayer.interior = interior; localPlayer.interior = interior;
game.cameraInterior = interior; game.cameraInterior = interior;
} else { } //else {
if(getGameConfig().mainWorldInterior != interior) { //if(getGameConfig().mainWorldInterior != interior) {
let interiorId = natives.getInteriorAtCoords(localPlayer.position); // let interiorId = natives.getInteriorAtCoords(localPlayer.position);
natives.activateInterior(interiorId, true); // natives.activateInterior(interiorId, true);
natives.loadAllObjectsNow(); // natives.loadAllObjectsNow();
} //}
let interiorId = natives.getInteriorAtCoords(localPlayer.position); //let interiorId = natives.getInteriorAtCoords(localPlayer.position);
natives.activateInterior(interiorId, true); //natives.activateInterior(interiorId, true);
} //}
} }
//let vehicles = getElementsByType(ELEMENT_VEHICLE); //let vehicles = getElementsByType(ELEMENT_VEHICLE);
@@ -575,24 +577,20 @@ function processWantedLevelReset() {
function processLocalPlayerVehicleControlState() { function processLocalPlayerVehicleControlState() {
if(areServerElementsSupported()) { if(areServerElementsSupported()) {
if(inVehicle && localPlayer.vehicle != null) { if(inVehicle && localPlayer.vehicle != null) {
if(getEntityData(localPlayer.vehicle, "vrr.engine") == false) { if(doesEntityDataExist(localPlayer.vehicle, "vrr.engine")) {
localPlayer.vehicle.engine = false; if(getEntityData(localPlayer.vehicle, "vrr.engine") == false) {
} localPlayer.vehicle.engine = false;
if(!localPlayer.vehicle.engine) {
if(typeof localPlayer.vehicle.velocity != "undefined") {
localPlayer.vehicle.velocity = toVector3(0.0, 0.0, 0.0);
localPlayer.vehicle.turnVelocity = toVector3(0.0, 0.0, 0.0);
}
if(!localPlayer.vehicle.engine) { //if(parkedVehiclePosition) {
if(typeof localPlayer.vehicle.velocity != "undefined") { // localPlayer.vehicle.position = parkedVehiclePosition;
localPlayer.vehicle.velocity = toVector3(0.0, 0.0, 0.0); // localPlayer.vehicle.heading = parkedVehicleHeading;
localPlayer.vehicle.turnVelocity = toVector3(0.0, 0.0, 0.0); //}
} }
if(parkedVehiclePosition) {
localPlayer.vehicle.position = parkedVehiclePosition;
localPlayer.vehicle.heading = parkedVehicleHeading;
}
} else {
if(parkedVehiclePosition) {
parkedVehiclePosition = false;
parkedVehicleHeading = false;
} }
} }
} }