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

Use some custom events from v-events

Browse Source
This commit is contained in:
Vortrex
2022-07-27 00:41:31 -05:00
parent f03502e380
commit dfaf611a1e
1 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
scripts/client/event.js
View File

@@ -40,11 +40,11 @@ function addAllEventHandlers() {
addEventHandler("OnElementStreamIn", onElementStreamIn); addEventHandler("OnElementStreamIn", onElementStreamIn);
addEventHandler("OnLocalPlayerEnteredVehicle", onLocalPlayerEnteredVehicle); addEventHandler("OnPedEnteredVehicleEx", onPedEnteredVehicle);
addEventHandler("OnLocalPlayerExitedVehicle", onLocalPlayerExitedVehicle); addEventHandler("OnPedExitedVehicleEx", onPedExitedVehicle);
addEventHandler("OnLocalPlayerEnterSphere", onLocalPlayerEnterSphere); addEventHandler("OnPedEnteredSphere", onPedEnteredSphere);
addEventHandler("OnLocalPlayerExitSphere", onLocalPlayerExitSphere); addEventHandler("OnPedExitedSphere", onPedExitedSphere);
addEventHandler("OnLocalPlayerSwitchWeapon", onLocalPlayerSwitchWeapon); addEventHandler("OnPedChangeWeapon", onPedChangeWeapon);
addEventHandler("OnPedInflictDamage", onPedInflictDamage); addEventHandler("OnPedInflictDamage", onPedInflictDamage);
@@ -150,32 +150,31 @@ function onElementStreamIn(event, element) {
// =========================================================================== // ===========================================================================
function onLocalPlayerExitedVehicle(event, vehicle, seat) { function onPedExitedVehicle(event, ped, vehicle, seat) {
logToConsole(LOG_DEBUG, `[VRR.Event] Local player exited vehicle`); //logToConsole(LOG_DEBUG, `[VRR.Event] Local player exited vehicle`);
sendNetworkEventToServer("agrp.onPlayerExitVehicle", getVehicleForNetworkEvent(vehicle), seat); //sendNetworkEventToServer("agrp.onPlayerExitVehicle", getVehicleForNetworkEvent(vehicle), seat);
if (inVehicleSeat) { //if (inVehicleSeat) {
parkedVehiclePosition = false; // parkedVehiclePosition = false;
parkedVehicleHeading = false; // parkedVehicleHeading = false;
} //}
} }
// =========================================================================== // ===========================================================================
function onLocalPlayerEnteredVehicle(event, vehicle, seat) { function onPedEnteredVehicle(event, ped, vehicle, seat) {
logToConsole(LOG_DEBUG, `[VRR.Event] Local player entered vehicle`); logToConsole(LOG_DEBUG, `[VRR.Event] Local player entered vehicle`);
//sendNetworkEventToServer("agrp.onPlayerEnterVehicle", getVehicleForNetworkEvent(vehicle), seat);
sendNetworkEventToServer("agrp.onPlayerEnterVehicle", getVehicleForNetworkEvent(vehicle), seat); //if (areServerElementsSupported()) {
//if(inVehicleSeat == 0) {
if (areServerElementsSupported()) { //setVehicleEngine(vehicle, false);
//if(inVehicleSeat == 0) { //if(!inVehicle.engine) {
//setVehicleEngine(vehicle, false); // parkedVehiclePosition = inVehicle.position;
//if(!inVehicle.engine) { // parkedVehicleHeading = inVehicle.heading;
// parkedVehiclePosition = inVehicle.position; //}
// parkedVehicleHeading = inVehicle.heading; //}
//} //}
//}
}
} }
// =========================================================================== // ===========================================================================
@@ -198,17 +197,37 @@ function onPedInflictDamage(event, damagedEntity, damagerEntity, weaponId, healt
// =========================================================================== // ===========================================================================
function onLocalPlayerEnterSphere(event, sphere) { function onPedEnteredSphere(event, ped, sphere) {
logToConsole(LOG_DEBUG, `[VRR.Event] Local player entered sphere`); if (isNull(ped)) {
if (sphere == jobRouteLocationSphere) { return false;
enteredJobRouteSphere(); }
if (isNull(localPlayer)) {
return false;
}
if (ped == localPlayer) {
logToConsole(LOG_DEBUG, `[VRR.Event] Local player entered sphere`);
if (sphere == jobRouteLocationSphere) {
enteredJobRouteSphere();
}
} }
} }
// =========================================================================== // ===========================================================================
function onLocalPlayerExitSphere(event, sphere) { function onPedExitedSphere(event, ped, sphere) {
logToConsole(LOG_DEBUG, `[VRR.Event] Local player exited sphere`); if (isNull(ped)) {
return false;
}
if (isNull(localPlayer)) {
return false;
}
if (ped == localPlayer) {
logToConsole(LOG_DEBUG, `[VRR.Event] Local player entered sphere`);
}
} }
// =========================================================================== // ===========================================================================
@@ -225,7 +244,7 @@ function onFocus(event) {
// =========================================================================== // ===========================================================================
function onLocalPlayerSwitchWeapon(oldWeapon, newWeapon) { function onPedChangeWeapon(event, ped, oldWeapon, newWeapon) {
} }