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

Added CS local player enter/exit veh events

Browse Source
This commit is contained in:
Vortrex
2020-12-16 07:53:26 -06:00
parent 5b55022eb9
commit cecabc7b65
1 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/client/main.js
View File

@@ -65,6 +65,8 @@ bindEventHandler("onResourceStart", thisResource, function(event, resource) {
addEvent("OnLocalPlayerEnterSphere", 1); addEvent("OnLocalPlayerEnterSphere", 1);
addEvent("OnLocalPlayerExitSphere", 1); addEvent("OnLocalPlayerExitSphere", 1);
addEvent("OnLocalPlayerEnterVehicle", 2);
addEvent("OnLocalPlayerExitVehicle", 2);
}); });
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -236,21 +238,37 @@ function initLocalPlayer(player) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function processEvent(event, deltaTime) { function processEvent(event, deltaTime) {
getElementsByType(ELEMENT_MARKER).forEach(function(sphere) { if(localPlayer != null) {
if(localPlayer.position.distance(sphere.position) <= sphere.radius) { getElementsByType(ELEMENT_MARKER).forEach(function(sphere) {
if(localPlayer.getData("ag.inSphere") == null) { if(localPlayer.position.distance(sphere.position) <= sphere.radius) {
localPlayer.setData("ag.inSphere", sphere); if(localPlayer.getData("ag.inSphere") == null) {
triggerEvent("OnLocalPlayerEnterSphere", sphere, sphere); localPlayer.setData("ag.inSphere", sphere);
triggerNetworkEvent("ag.onPlayerEnterSphere", sphere); triggerEvent("OnLocalPlayerEnterSphere", sphere, sphere);
triggerNetworkEvent("ag.onPlayerEnterSphere", sphere);
}
} else {
if(localPlayer.getData("ag.inSphere") != null) {
localPlayer.removeData("ag.inSphere");
triggerEvent("OnLocalPlayerExitSphere", sphere, sphere);
triggerNetworkEvent("ag.onPlayerExitSphere", sphere);
}
}
});
if(localPlayer.vehicle != null) {
if(!inVehicle) {
inVehicle = localPlayer.vehicle;
triggerEvent("OnLocalPlayerEnterVehicle", inVehicle, inVehicle);
triggerNetworkEvent("ag.onPlayerEnterVehicle", inVehicle);
} }
} else { } else {
if(localPlayer.getData("ag.inSphere") != null) { if(inVehicle) {
localPlayer.removeData("ag.inSphere", sphere); triggerEvent("OnLocalPlayerExitVehicle", inVehicle, inVehicle);
triggerEvent("OnLocalPlayerExitSphere", sphere, sphere); triggerNetworkEvent("ag.onPlayerExitVehicle", inVehicle);
triggerNetworkEvent("ag.onPlayerExitSphere", sphere); inVehicle = false;
} }
} }
}); }
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -391,11 +409,16 @@ addEventHandler("OnPedWasted", function(event, wastedPed, killerPed, weapon, ped
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
addNetworkHandler("ag.showBusStop", function(position, colour) { addNetworkHandler("ag.showBusStop", function(position, colour) {
let busStopSphere = gta.createSphere(position, 3); busStopSphere = gta.createSphere(position, 3);
let busStopBlip = gta.createBlip(position, 0, 2, colour); busStopBlip = gta.createBlip(position, 0, 2, colour);
bindEventHandler("OnLocalPlayerEnterSphere", busStopSphere, function(event, sphere) { bindEventHandler("OnLocalPlayerEnterSphere", busStopSphere, function(event, sphere) {
triggerNetworkEvent("ag.arrivedAtBusStop"); triggerNetworkEvent("ag.arrivedAtBusStop");
unbindEventHandler("OnLocalPlayerEnterSphere", busStopSphere);
destroyElement(busStopSphere);
destroyElement(busStopBlip);
busStopSphere = null;
busStopBlip = null;
}); });
}); });