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

Use old native as new one broke drawing 3d text

Browse Source
This commit is contained in:
ElPumpo
2018-12-23 17:46:55 +01:00
parent b63c147fc0
commit 201b5f9ff2
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/functions.lua
+1 -1
View File
@@ -966,7 +966,7 @@ ESX.Game.SetVehicleProperties = function(vehicle, props)
end
ESX.Game.Utils.DrawText3D = function(coords, text, size)
local onScreen, x, y = GetScreenCoordFromWorldCoord(coords.x, coords.y, coords.z)
local onScreen, x, y = World3dToScreen2d(coords.x, coords.y, coords.z)
local camCoords = GetGameplayCamCoords()
local dist = GetDistanceBetweenCoords(camCoords, coords.x, coords.y, coords.z, true)
local size = size
server/main.lua
+4 -7
View File
@@ -421,20 +421,17 @@ AddEventHandler('esx:removeInventoryItem', function(type, itemName, itemCount)
end
end
-- workaround for CreateAmbientPickup() giving 30 rounds of ammo when you drop the weapon with 0 ammo
if itemCount == 0 then
itemCount = 1
end
if xPlayer.hasWeapon(itemName) then
local weaponLabel, weaponPickup = ESX.GetWeaponLabel(itemName), 'PICKUP_' .. string.upper(itemName)
xPlayer.removeWeapon(itemName)
TriggerClientEvent('esx:pickupWeapon', _source, weaponPickup, itemName, itemCount)
if itemCount > 0 then
TriggerClientEvent('esx:pickupWeapon', _source, weaponPickup, itemName, itemCount)
TriggerClientEvent('esx:showNotification', _source, _U('threw_weapon_ammo', weaponLabel, itemCount))
else
-- workaround for CreateAmbientPickup() giving 30 rounds of ammo when you drop the weapon with 0 ammo
TriggerClientEvent('esx:pickupWeapon', _source, weaponPickup, itemName, 1)
TriggerClientEvent('esx:showNotification', _source, _U('threw_weapon', weaponLabel))
end
end