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

Remove client-side job sphere

Browse Source
This commit is contained in:
Vortrex
2022-07-30 08:14:49 -05:00
parent af699acd24
commit 3a501f0b39
1 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/client/job.js
View File

@@ -11,7 +11,6 @@
let localPlayerJobType = 0; let localPlayerJobType = 0;
let localPlayerWorking = false; let localPlayerWorking = false;
let jobRouteLocationBlip = null; let jobRouteLocationBlip = null;
let jobRouteLocationSphere = null;
let jobBlipBlinkAmount = 0; let jobBlipBlinkAmount = 0;
let jobBlipBlinkTimes = 10; let jobBlipBlinkTimes = 10;
@@ -58,45 +57,13 @@ function setLocalPlayerWorkingState(tempWorking) {
function showJobRouteLocation(position, colour) { function showJobRouteLocation(position, colour) {
logToConsole(LOG_DEBUG, `[VRR.Job] Showing job route location`); logToConsole(LOG_DEBUG, `[VRR.Job] Showing job route location`);
if (getMultiplayerMod() == AGRP_MPMOD_GTAC) {
if (getGame() == AGRP_GAME_GTA_SA) {
// Server-side spheres don't show in GTA SA for some reason.
jobRouteLocationSphere = game.createPickup(1318, position, 1);
} else {
jobRouteLocationSphere = game.createSphere(position, 3);
jobRouteLocationSphere.colour = colour;
}
if (jobRouteLocationBlip != null) {
destroyElement(jobRouteLocationBlip);
}
// Blinking is bugged if player hit the spot before it stops blinking.
blinkJobRouteLocationBlip(10, position, colour);
jobRouteLocationBlip = game.createBlip(position, 0, 2, colour);
}
}
// ===========================================================================
function enteredJobRouteSphere() {
logToConsole(LOG_DEBUG, `[VRR.Job] Entered job route sphere`);
clearInterval(jobBlipBlinkTimer);
jobBlipBlinkAmount = 0;
jobBlipBlinkTimes = 0;
if (jobRouteLocationBlip != null) { if (jobRouteLocationBlip != null) {
destroyElement(jobRouteLocationBlip); destroyElement(jobRouteLocationBlip);
jobRouteLocationBlip = null;
} }
if (jobRouteLocationSphere != null) { // Blinking is bugged if player hit the spot before it stops blinking.
destroyElement(jobRouteLocationSphere); blinkJobRouteLocationBlip(10, position, colour);
jobRouteLocationSphere = null; jobRouteLocationBlip = game.createBlip(position, 0, 2, colour);
}
tellServerPlayerArrivedAtJobRouteLocation();
} }
// =========================================================================== // ===========================================================================
@@ -128,10 +95,14 @@ function blinkJobRouteLocationBlip(times, position, colour) {
// =========================================================================== // ===========================================================================
function hideJobRouteLocation() { function hideJobRouteLocation() {
destroyElement(jobRouteLocationSphere); clearInterval(jobBlipBlinkTimer);
destroyElement(jobRouteLocationBlip); jobBlipBlinkAmount = 0;
jobRouteLocationSphere = null; jobBlipBlinkTimes = 0;
jobRouteLocationBlip = null;
if (jobRouteLocationBlip != null) {
destroyElement(jobRouteLocationBlip);
jobRouteLocationBlip = null;
}
} }
// =========================================================================== // ===========================================================================