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

Use new ped define (civ was removed)

Browse Source
This commit is contained in:
Vortrex
2021-07-13 00:56:33 -05:00
parent fa1bda0429
commit 216a4c53fc
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/server/utilities.js
View File

@@ -408,7 +408,7 @@ function getCiviliansInRange(position, range) {
let peds = getPeds(); let peds = getPeds();
let inRangeCivilians = []; let inRangeCivilians = [];
for(let i in peds) { for(let i in peds) {
if(peds[i].isType(ELEMENT_CIVILIANS)) { if(peds[i].isType(ELEMENT_PED)) {
if(getDistance(position, peds[i].position) <= range) { if(getDistance(position, peds[i].position) <= range) {
inRangeCivilians.push(peds[i]); inRangeCivilians.push(peds[i]);
} }
@@ -727,6 +727,23 @@ function getWeatherFromParams(params) {
// =========================================================================== // ===========================================================================
function getAnimationFromParams(params) {
if(isNaN(params)) {
for(let i in getGameData().animations[getServerGame()]) {
if(toLowerCase(getGameData().animations[getServerGame()][i][0]).indexOf(toLowerCase(params)) != -1) {
return i;
}
}
} else {
if(typeof getGameData().animations[getServerGame()][params] != "undefined") {
return toInteger(params);
}
}
return 0;
}
// ===========================================================================
function getClanFromParams(params) { function getClanFromParams(params) {
if(isNaN(params)) { if(isNaN(params)) {
for(let i in getServerData().clans) { for(let i in getServerData().clans) {
@@ -797,12 +814,12 @@ function getBusinessFromParams(params) {
function getGameLocationFromParams(params) { function getGameLocationFromParams(params) {
if(isNaN(params)) { if(isNaN(params)) {
for(let i in getGameData().locations) { for(let i in getGameData().locations) {
if(toLowerCase(getGameData().locations[i][0]).indexOf(toLowerCase(params)) != -1) { if(toLowerCase(getGameData().locations[getServerGame()][i][0]).indexOf(toLowerCase(params)) != -1) {
return i; return i;
} }
} }
} else { } else {
if(typeof getGameData().locations[params] != "undefined") { if(typeof getGameData().locations[getServerGame()][params] != "undefined") {
return toInteger(params); return toInteger(params);
} }
} }
@@ -1239,7 +1256,7 @@ function getClientsInRange(position, distance) {
// =========================================================================== // ===========================================================================
function getCiviliansInRange(position, distance) { function getCiviliansInRange(position, distance) {
return getElementsByType(ELEMENT_CIVILIAN).filter(x => x.position.distance(position) <= distance); return getElementsByType(ELEMENT_PED).filter(x => x.position.distance(position) <= distance);
} }
// =========================================================================== // ===========================================================================
@@ -1251,7 +1268,7 @@ function getElementsByTypeInRange(elementType, position, distance) {
// =========================================================================== // ===========================================================================
function getClosestCivilian(position) { function getClosestCivilian(position) {
return getElementsByType(ELEMENT_CIVILIAN).reduce((i, j) => ((i.position.distance(position) <= j.position.distance(position)) ? i : j)); return getElementsByType(ELEMENT_PED).reduce((i, j) => ((i.position.distance(position) <= j.position.distance(position)) ? i : j));
} }
// =========================================================================== // ===========================================================================