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

Move entity data utils to native

Browse Source
This commit is contained in:
Vortrex
2022-04-16 21:43:01 -05:00
parent 11d5833c61
commit dd2adbf02a
2 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/client/native/connected.js
View File

@@ -162,4 +162,30 @@ function createGameBlip(blipModel, position, name = "") {
return -1;
}
// ===========================================================================
function setEntityData(entity, dataName, dataValue, syncToClients = true) {
if(entity != null) {
return entity.setData(dataName, dataValue);
}
}
// ===========================================================================
function removeEntityData(entity, dataName) {
if(entity != null) {
return entity.removeData(dataName);
}
return null;
}
// ===========================================================================
function doesEntityDataExist(entity, dataName) {
if(entity != null) {
return (entity.getData(dataName) != null);
}
return null;
}
// ===========================================================================

80
scripts/shared/utilities.js
View File

@@ -1331,36 +1331,6 @@ function getEntityData(entity, dataName) {
// ===========================================================================
function setEntityData(entity, dataName, dataValue, syncToClients = true) {
if(entity != null) {
if(typeof server != "undefined") {
return entity.setData(dataName, dataValue, syncToClients);
} else {
return entity.setData(dataName, dataValue);
}
}
}
// ===========================================================================
function removeEntityData(entity, dataName) {
if(entity != null) {
return entity.removeData(dataName);
}
return null;
}
// ===========================================================================
function doesEntityDataExist(entity, dataName) {
if(entity != null) {
return (entity.getData(dataName) != null);
}
return null;
}
// ===========================================================================
function getDistance(vec1, vec2) {
if(isNull(vec1) || isNull(vec2)) {
return false;
@@ -2045,7 +2015,7 @@ async function waitUntil(condition) {
return new Promise((resolve) => {
let interval = setInterval(() => {
if (!condition()) {
return
return;
}
clearInterval(interval);
@@ -2769,4 +2739,52 @@ function isWeekend() {
return d.getDay() == 6 || d.getDay() == 0;
}
// ===========================================================================
/*
function getPlayerLocationName(client) {
if(getPlayerBusiness(client)) {
return `at ${getBusinessData(getPlayerBusiness(client)).name}`;
}
if(getPlayerHouse(client)) {
return `at ${getHouseData(getPlayerHouse(client)).description}`;
}
let closestBusiness = getClosestBusinessEntrance(client.position, getPlayerDimension(client));
if(getBusinessData(closestBusiness)) {
return `near ${getBusinessData(closestBusiness).name} in ${getGameAreaFromPos(getPlayerPosition(client))}`;
}
let closestHouse = getClosestHouseEntrance(client.position, getPlayerDimension(client));
if(getHouseData(closestHouse)) {
let areaId = getGameAreaFromPos(getPlayerPosition(client));
if(getDistance(getHouseData(closestHouse).entrancePosition) > 7) {
return `near ${getHouseData(closestHouse).description} in ${getGameConfig().areas[getGame()][areaId][1]}`;
}
}
}
*/
// ===========================================================================
function getGameAreaFromPos(position) {
let areas = getGameConfig().areas[getGame()];
for(let i in areas) {
if(isPointInPoly(areas[i].borders, position)) {
return i;
}
}
}
// ===========================================================================
function isPosInPoly(poly, position) {
for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
((poly[i].y <= position.y && position.y < poly[j].y) || (poly[j].y <= position.y && position.y < poly[i].y))
&& (position.x < (poly[j].x - poly[i].x) * (position[1] - poly[i].y) / (poly[j].y - poly[i].y) + poly[i].x)
&& (c = !c);
return c;
}
// ===========================================================================