From 7dc13baed8c0edca382b172c745d02e0fd8f14a3 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 17 Dec 2019 12:34:03 +0000 Subject: [PATCH] Update cl_radar.lua --- cl_radar.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cl_radar.lua b/cl_radar.lua index f998716..f5ef47c 100644 --- a/cl_radar.lua +++ b/cl_radar.lua @@ -9,6 +9,7 @@ local next = next local dot = dot local table = table +<<<<<<< HEAD local type = type local tostring = tostring local math = math @@ -29,6 +30,9 @@ Citizen.SetTimeout( 1000, function() SendNUIMessage( { _type = "updatePathName", pathName = name } ) end ) --local type = type +======= +local type = type +>>>>>>> parent of 294c82c... Fixed misspellings. --[[---------------------------------------------------------------------------------- @@ -157,6 +161,7 @@ RADAR.vars = -- Table for temp id storage to stop unnecessary trace checks tempVehicleIDs = {}, +<<<<<<< HEAD -- The current vehicle data for display activeVehicles = {}, --[[-- Radar stage, this is used to tell the system what it should currently be doing, the stages are: @@ -164,6 +169,13 @@ RADAR.vars = -- - 1 = Filtering the vehicles caught -- - 3 = Calculating what vehicle speed to show based on modes radarStage = 0, ]] +======= + -- Radar stage, this is used to tell the system what it should currently be doing, the stages are: + -- - 0 = gathering vehicles hit by the radar + -- - 1 = Filtering the vehicles caught + -- - 3 = Calculating what vehicle speed to show based on modes + radarStage = 0, +>>>>>>> parent of 294c82c... Fixed misspellings. -- Vehicle pool, automatically populated when the system is running, holds all of the current -- vehicle IDs for the player using entity enumeration (see cl_utils.lua)