From 6c83e15b4edd93bd57675defdbdb412c30f41da2 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 4 Apr 2019 19:15:30 +0200 Subject: [PATCH] Proper arguments, minor changes --- client/main.lua | 7 ++----- config.lua | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/client/main.lua b/client/main.lua index aba47778..ca12255b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -135,8 +135,7 @@ function OpenDMVSchoolMenu() ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'dmvschool_actions', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'dmvschool_actions', { title = _U('driving_school'), elements = elements, align = 'top-left' @@ -209,7 +208,6 @@ end) -- Display markers Citizen.CreateThread(function() while true do - Citizen.Wait(0) local coords = GetEntityCoords(PlayerPedId()) @@ -219,7 +217,6 @@ Citizen.CreateThread(function() DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) end end - end end) @@ -277,7 +274,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if CurrentAction ~= nil then + if CurrentAction then ESX.ShowHelpNotification(CurrentActionMsg) diff --git a/config.lua b/config.lua index ffd216a6..d58e6dd8 100644 --- a/config.lua +++ b/config.lua @@ -2,7 +2,7 @@ Config = {} Config.DrawDistance = 100.0 Config.MaxErrors = 5 Config.SpeedMultiplier = 3.6 -Config.Locale = 'sv' +Config.Locale = 'fr' Config.Prices = { dmv = 500, @@ -62,7 +62,7 @@ Config.CheckPoints = { Action = function(playerPed, vehicle, setCurrentZoneType) Citizen.CreateThread(function() DrawMissionText(_U('stop_for_ped'), 5000) - PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', 0, 0, 1) + PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', false, 0, true) FreezeEntityPosition(vehicle, true) Citizen.Wait(4000) @@ -79,7 +79,7 @@ Config.CheckPoints = { Citizen.CreateThread(function() DrawMissionText(_U('stop_look_left', Config.SpeedLimits['town']), 5000) - PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', 0, 0, 1) + PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', false, 0, true) FreezeEntityPosition(vehicle, true) Citizen.Wait(6000) @@ -107,7 +107,7 @@ Config.CheckPoints = { Pos = {x = -73.542, y = -1364.335, z = 27.789}, Action = function(playerPed, vehicle, setCurrentZoneType) DrawMissionText(_U('stop_for_passing'), 5000) - PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', 0, 0, 1) + PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', false, 0, true) FreezeEntityPosition(vehicle, true) Citizen.Wait(6000) FreezeEntityPosition(vehicle, false) @@ -134,7 +134,7 @@ Config.CheckPoints = { setCurrentZoneType('freeway') DrawMissionText(_U('hway_time', Config.SpeedLimits['freeway']), 5000) - PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', 0, 0, 1) + PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', false, 0, true) end }, @@ -171,7 +171,7 @@ Config.CheckPoints = { Pos = {x = 1163.603, y = -1841.771, z = 35.679}, Action = function(playerPed, vehicle, setCurrentZoneType) DrawMissionText(_U('gratz_stay_alert'), 5000) - PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', 0, 0, 1) + PlaySound(-1, 'RACE_PLACED', 'HUD_AWARDS', false, 0, true) end },