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

Undo all fixes for IV

Browse Source
This commit is contained in:
Vortrex
2020-12-12 18:08:05 -06:00
parent c2fc4db3dc
commit ae3e5578dc
1 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
scripts/server/native.js
View File

@@ -73,31 +73,25 @@ function getServerGame() {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getPlayerPosition(client) { function getPlayerPosition(client) {
//return (isGTAIV()) ? getEntityData(client, "ag.position") : client.player.position; return client.player.position;
return getEntityData(client, "ag.position");
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getPlayerHeading(client) { function getPlayerHeading(client) {
//return (isGTAIV()) ? getEntityData(client, "ag.heading") : client.player.heading; return client.player.heading;
return getEntityData(client, "ag.heading");
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getPlayerVehicle(client) { function getPlayerVehicle(client) {
//return (isGTAIV()) ? getVehicleDataFromSyncId(getEntityData(client, "ag.vehicle")) : getVehicleData(client.player.vehicle); return client.player.vehicle;
let playerVehicle = getEntityData(client, "ag.vehicle");
let vehicleData = getVehicleDataFromSyncId(playerVehicle);
console.log(`playerVehicle: ${playerVehicle}, vehicleData: ${vehicleData}`);
return vehicleData;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function isPlayerInAnyVehicle(client) { function isPlayerInAnyVehicle(client) {
return doesEntityDataExist(client, "ag.vehicle"); return (client.player.vehicle != null);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -109,41 +103,43 @@ function getPlayerVehicleSeat(client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function isPlayerSpawned(client) { function isPlayerSpawned(client) {
return getEntityData(client, "ag.spawned"); return client.player
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehiclePosition(vehicleData) { function getVehiclePosition(vehicle) {
//return (isGTAIV()) ? vehicleData.syncPosition : vehicleData.vehicle.position; return vehicle.position;
return vehicleData.syncPosition;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehicleHeading(vehicleData) { function getVehicleHeading(vehicle) {
//return (isGTAIV()) ? vehicleData.syncHeading : vehicleData.vehicle.heading; return vehicle.heading;
return vehicleData.syncHeading;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehicleSyncer(vehicleData) { function getVehicleSyncer(vehicle) {
if(isGTAIV()) { return vehicleData.vehicle.syncer;
return vehicleData.syncedBy;
} else {
vehicleData.vehicle.syncer;
}
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function getVehicleForNetworkEvent(vehicleData) { function getVehicleForNetworkEvent(vehicle) {
if(isGTAIV()) { return vehicle;
return vehicleData.syncId; }
} else {
vehicleData.vehicle.syncer; // ---------------------------------------------------------------------------
}
function deleteGameElement(element) {
destroyElement(element);
}
// ---------------------------------------------------------------------------
function isPlayerInFrontVehicleSeat(client) {
return (getPlayerVehicleSeat(client) == 0 || getPlayerVehicleSeat(client) == 1);
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------