starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 02:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/1148' into legacy

Browse Source
This commit is contained in:
Linden
2021-05-16 19:31:19 +10:00
parent a3d9e83988 0a70609741
commit 08088cc82a
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/functions.lua
+8 -6
View File
@@ -326,7 +326,8 @@ ESX.Game.Teleport = function(entity, coords, cb)
end
end
ESX.Game.SpawnObject = function(model, coords, cb, networked, dynamic)
ESX.Game.SpawnObject = function(object, coords, cb, networked, dynamic)
local model = (type(object) == 'number' and model or GetHashKey(object))
local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
networked = networked == nil and true or false
dynamic = dynamic ~= nil and true or false
@@ -344,9 +345,9 @@ ESX.Game.SpawnObject = function(model, coords, cb, networked, dynamic)
end)
end
ESX.Game.SpawnLocalObject = function(model, coords, cb)
ESX.Game.SpawnLocalObject = function(object, coords, cb)
-- Why have 2 separate functions for this? Just call the other one with an extra param
ESX.Game.SpawnObject(model, coords, cb, false)
ESX.Game.SpawnObject(object, coords, cb, false)
end
ESX.Game.DeleteVehicle = function(vehicle)
@@ -359,7 +360,8 @@ ESX.Game.DeleteObject = function(object)
DeleteObject(object)
end
ESX.Game.SpawnVehicle = function(model, coords, heading, cb, networked)
ESX.Game.SpawnVehicle = function(vehicle, coords, heading, cb, networked)
local model = (type(vehicle) == 'number' and vehicle or GetHashKey(vehicle))
local vector = type(coords) == "vector3" and coords or vec(coords.x, coords.y, coords.z)
networked = networked == nil and true or false
CreateThread(function()
@@ -388,9 +390,9 @@ ESX.Game.SpawnVehicle = function(model, coords, heading, cb, networked)
end)
end
ESX.Game.SpawnLocalVehicle = function(model, coords, heading, cb)
ESX.Game.SpawnLocalVehicle = function(vehicle, coords, heading, cb)
-- Why have 2 separate functions for this? Just call the other one with an extra param
ESX.Game.SpawnVehicle(model, coords, heading, cb, false)
ESX.Game.SpawnVehicle(vehicle, coords, heading, cb, false)
end
ESX.Game.IsVehicleEmpty = function(vehicle)