From 9b06e8d1f909ef59ecba9d209a7dfd195c9b030e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 16 Aug 2017 16:07:29 +0200 Subject: [PATCH] Fix VehicleDeleter --- client/main.lua | 4 ++-- config.lua | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index 0e262bd4..418ea4b3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -602,7 +602,7 @@ Citizen.CreateThread(function() for k,v in pairs(Config.Zones) do if(v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then - DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + 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, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) end end @@ -620,7 +620,7 @@ Citizen.CreateThread(function() local currentZone = nil for k,v in pairs(Config.Zones) do - if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.MarkerSize.x) then + if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then isInMarker = true currentZone = k end diff --git a/config.lua b/config.lua index f41fe565..209fef42 100644 --- a/config.lua +++ b/config.lua @@ -1,7 +1,6 @@ Config = {} Config.DrawDistance = 100.0 Config.MarkerColor = {r = 102, g = 0, b = 102} -Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} Config.RespawnDelayAfterRPDeath = 10 * 60 * 1000 Config.RemoveWeaponsAfterRPDeath = true Config.RemoveCashAfterRPDeath = true @@ -14,61 +13,73 @@ Config.Zones = { HospitalInteriorEntering1 = { Pos = {x = 1151.447, y = -1529.491, z = 34.375}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = 1 }, HospitalInteriorInside1 = { Pos = {x = 251.464, y = -1369.770, z = 28.648}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = -1 }, HospitalInteriorOutside1 = { Pos = {x = 1153.364, y = -1525.731, z = 33.843}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = -1 }, HospitalInteriorExit1 = { Pos = {x = 253.612, y = -1371.66, z = 28.647}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = 1 }, HospitalInteriorEntering2 = { Pos = {x = 1137.181, y = -1597.504, z = 33.692}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = 1 }, HospitalInteriorInside2 = { Pos = {x = 240.508, y = -1360.565, z = 28.647}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = -1 }, HospitalInteriorOutside2 = { Pos = {x = 1137.922, y = -1601.434, z = 33.692}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = -1 }, HospitalInteriorExit2 = { Pos = {x = 238.587, y = -1359.113, z = 28.647}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = 1 }, AmbulanceActions = { Pos = {x = 244.048, y = -1366.330, z = 28.647}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = 1 }, VehicleSpawner = { Pos = {x = 1128.290, y = -1601.451, z = 33.893}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = 1 }, VehicleSpawnPoint = { Pos = {x = 1138.061, y = -1607.882, z = 34.692}, + Size = {x = 1.5, y = 1.5, z = 1.0}, Type = -1 }, VehicleDeleter = { Pos = {x = 1122.436, y = -1617.600, z = 33.692}, + Size = {x = 3.0, y = 3.0, z = 2.0}, Type = 1 }