Minor changes

This commit is contained in:
ElPumpo
2018-07-05 18:04:40 +02:00
parent e1c2b478dd
commit a9a0dedeed
4 changed files with 11 additions and 15 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
root = true
[*]
indent_size = 2
indent_style = space
indent_size = 4
indent_style = tab
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
-1
View File
@@ -58,7 +58,6 @@ git clone https://github.com/ESX-Org/esx_menu_list [esx]/[ui]/esx_menu_list
- Download https://github.com/ESX-Org/esx_menu_list/releases/latest
- Put it in the `resource/[esx]/[ui]` directory
## Installation
- Import `es_extended.sql` in your database
- Configure your `server.cfg` to look like this
+8 -11
View File
@@ -10,8 +10,6 @@ local Keys = {
["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118
}
local GUI = {}
GUI.Time = 0
local LoadoutLoaded = false
local IsPaused = false
local PlayerSpawned = false
@@ -76,11 +74,12 @@ AddEventHandler('playerSpawned', function()
isDead = false
end)
AddEventHandler('baseevents:onPlayerDied', function(killerType, coords)
AddEventHandler('baseevents:onPlayerDied', function(killerType, deathCoords)
TriggerEvent('esx:onPlayerDeath')
end)
AddEventHandler('baseevents:onPlayerKilled', function(killerId, data)
-- handle death client side (could have been server side...)
AddEventHandler('baseevents:onPlayerKilled', function(killerPed, data)
TriggerEvent('esx:onPlayerDeath')
end)
@@ -100,7 +99,7 @@ AddEventHandler('skinchanger:modelLoaded', function()
TriggerEvent('esx:restoreLoadout')
end)
AddEventHandler('esx:restoreLoadout', function ()
AddEventHandler('esx:restoreLoadout', function()
local playerPed = GetPlayerPed(-1)
RemoveAllPedWeapons(playerPed, true)
@@ -199,7 +198,6 @@ end)
-- Commands
RegisterNetEvent('esx:teleport')
AddEventHandler('esx:teleport', function(pos)
pos.x = pos.x + 0.0
pos.y = pos.y + 0.0
pos.z = pos.z + 0.0
@@ -478,9 +476,8 @@ Citizen.CreateThread(function()
Citizen.Wait(10)
if IsControlPressed(0, Keys["F2"]) and GetLastInputMethod(2) and not isDead and not ESX.UI.Menu.IsOpen('default', 'es_extended', 'inventory') and (GetGameTimer() - GUI.Time) > 150 then
if IsControlJustReleased(0, Keys["F2"]) and GetLastInputMethod(2) and not isDead and not ESX.UI.Menu.IsOpen('default', 'es_extended', 'inventory') then
ESX.ShowInventory()
GUI.Time = GetGameTimer()
end
end
@@ -492,14 +489,14 @@ if Config.ShowDotAbovePlayer then
Citizen.CreateThread(function()
while true do
Citizen.Wait(0)
Citizen.Wait(1)
local players = ESX.Game.GetPlayers()
for i = 1, #players, 1 do
if players[i] ~= PlayerId() then
local ped = GetPlayerPed(players[i])
local headId = Citizen.InvokeNative(0xBFEFE3321A3F5015, ped, ('·'), false, false, '', false)
local headId = CreateMpGamerTag(ped, ('·'), false, false, '', false)
end
end
@@ -587,7 +584,7 @@ Citizen.CreateThread(function()
while true do
Citizen.Wait(10)
Citizen.Wait(1000)
local playerPed = GetPlayerPed(-1)
+1 -1
View File
@@ -47,7 +47,7 @@ html {
.menu {
font-family: 'Open Sans', sans-serif;
min-width : 400px;
min-height: : 250px;
min-height : 250px;
color : #fff;
position : absolute;
left : 40;