Revert "Run menu check and anti-wanted every frame"

This reverts commit c95ac3b87f.
This commit is contained in:
ElPumpo
2018-12-30 21:41:59 +01:00
parent c95ac3b87f
commit ccc36f388b
5 changed files with 6 additions and 31 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
description 'ES Extended'
version '1.1.0'
version '1.0.14'
server_scripts {
'@async/async.lua',
+2 -2
View File
@@ -480,7 +480,7 @@ end)
Citizen.CreateThread(function()
while true do
Citizen.Wait(0)
Citizen.Wait(10)
if IsControlJustReleased(0, Keys['F2']) and GetLastInputMethod(2) and not isDead and not ESX.UI.Menu.IsOpen('default', 'es_extended', 'inventory') then
ESX.ShowInventory()
@@ -515,7 +515,7 @@ if Config.DisableWantedLevel then
Citizen.CreateThread(function()
while true do
Citizen.Wait(0)
Citizen.Wait(10)
local playerId = PlayerId()
if GetPlayerWantedLevel(playerId) ~= 0 then
-25
View File
@@ -1,25 +0,0 @@
ESX.Blip.CreateBlip = function(coords, text, sprite, color, scale, display)
local blip = AddBlipForCoord( table.unpack(coords) )
SetBlipSprite(blip, sprite)
if display then
SetBlipDisplay(blip, display)
end
if scale then
SetBlipScale(blip, scale)
end
if color then
SetBlipColour(blip, color)
end
SetBlipAsShortRange(blip, true)
BeginTextCommandSetBlipName('STRING')
AddTextComponentSubstringPlayerName(text)
EndTextCommandSetBlipName(blip)
return blip
end
+2 -2
View File
@@ -47,7 +47,7 @@ ESX.Scaleform.ShowBreakingNews = function(title, msg, bottom, sec)
SetScaleformMovieAsNoLongerNeeded(scaleform)
end
ESX.Scaleform.ShowPopupWarning = function(title, msg, footer, sec)
ESX.Scaleform.ShowPopupWarning = function(title, msg, bottom, sec)
local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie('POPUP_WARNING')
BeginScaleformMovieMethod(scaleform, 'SHOW_POPUP_WARNING')
@@ -55,7 +55,7 @@ ESX.Scaleform.ShowPopupWarning = function(title, msg, footer, sec)
PushScaleformMovieMethodParameterFloat(500.0) -- black background
PushScaleformMovieMethodParameterString(title)
PushScaleformMovieMethodParameterString(msg)
PushScaleformMovieMethodParameterString(footer)
PushScaleformMovieMethodParameterString(bottom)
PushScaleformMovieMethodParameterBool(true)
EndScaleformMovieMethod()
+1 -1
View File
@@ -1,5 +1,5 @@
Config = {}
Config.Locale = 'sv'
Config.Locale = 'fr'
Config.Accounts = { 'bank', 'black_money' }
Config.AccountLabels = { bank = _U('bank'), black_money = _U('black_money') }