Minor changes

This commit is contained in:
ElPumpo
2020-02-11 21:25:46 +01:00
parent fe0d3b6174
commit f147a7be81
2 changed files with 16 additions and 19 deletions
+12 -17
View File
@@ -27,12 +27,12 @@ function ShowLoadingPromt(msg, time, type)
Citizen.CreateThread(function()
Citizen.Wait(0)
BeginTextCommandBusyString('STRING')
BeginTextCommandBusyspinnerOn('STRING')
AddTextComponentSubstringPlayerName(msg)
EndTextCommandBusyString(type)
EndTextCommandBusyspinnerOn(type)
Citizen.Wait(time)
RemoveLoadingPrompt()
BusyspinnerOff()
end)
end
@@ -108,15 +108,13 @@ end
function OpenCloakroom()
ESX.UI.Menu.CloseAll()
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'taxi_cloakroom',
{
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'taxi_cloakroom', {
title = _U('cloakroom_menu'),
align = 'top-left',
elements = {
{ label = _U('wear_citizen'), value = 'wear_citizen' },
{ label = _U('wear_work'), value = 'wear_work'}
}
}, function(data, menu)
{label = _U('wear_citizen'), value = 'wear_citizen'},
{label = _U('wear_work'), value = 'wear_work'}
}}, function(data, menu)
if data.current.value == 'wear_citizen' then
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin)
TriggerEvent('skinchanger:loadSkin', skin)
@@ -155,8 +153,7 @@ function OpenVehicleSpawnerMenu()
})
end
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner',
{
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner', {
title = _U('spawn_veh'),
align = 'top-left',
elements = elements
@@ -176,7 +173,6 @@ function OpenVehicleSpawnerMenu()
end)
TriggerServerEvent('esx_society:removeVehicleFromGarage', 'taxi', vehicleProps)
end, function(data, menu)
CurrentAction = 'vehicle_spawner'
CurrentActionMsg = _U('spawner_prompt')
@@ -188,11 +184,10 @@ function OpenVehicleSpawnerMenu()
else -- not society vehicles
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner',
{
title = _U('spawn_veh'),
align = 'top-left',
elements = Config.AuthorizedVehicles
ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'vehicle_spawner', {
title = _U('spawn_veh'),
align = 'top-left',
elements = Config.AuthorizedVehicles
}, function(data, menu)
if not ESX.Game.IsSpawnPointClear(Config.Zones.VehicleSpawnPoint.Pos, 5.0) then
ESX.ShowNotification(_U('spawnpoint_blocked'))