Michatec/wk_wars2x
1
1
Fork 0
mirror of https://github.com/Michatec/wk_wars2x.git synced 2026-04-01 00:16:27 +02:00
Code Issues Packages Projects Releases Activity

Revert "Update cl_radar.lua"

Browse Source 
This reverts commit 7dc13baed8.
This commit is contained in:
Dan
2019-12-17 12:36:51 +00:00
parent 8c3058bf44
commit 105efa71ad
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cl_radar.lua
View File

@@ -9,7 +9,6 @@
local next = next local next = next
local dot = dot local dot = dot
local table = table local table = table
<<<<<<< HEAD
local type = type local type = type
local tostring = tostring local tostring = tostring
local math = math local math = math
@@ -30,9 +29,6 @@ Citizen.SetTimeout( 1000, function()
SendNUIMessage( { _type = "updatePathName", pathName = name } ) SendNUIMessage( { _type = "updatePathName", pathName = name } )
end ) end )
--local type = type --local type = type
=======
local type = type
>>>>>>> parent of 294c82c... Fixed misspellings.
--[[---------------------------------------------------------------------------------- --[[----------------------------------------------------------------------------------
@@ -161,7 +157,6 @@ RADAR.vars =
-- Table for temp id storage to stop unnecessary trace checks -- Table for temp id storage to stop unnecessary trace checks
tempVehicleIDs = {}, tempVehicleIDs = {},
<<<<<<< HEAD
-- The current vehicle data for display -- The current vehicle data for display
activeVehicles = {}, activeVehicles = {},
--[[-- Radar stage, this is used to tell the system what it should currently be doing, the stages are: --[[-- Radar stage, this is used to tell the system what it should currently be doing, the stages are:
@@ -169,13 +164,6 @@ RADAR.vars =
-- - 1 = Filtering the vehicles caught -- - 1 = Filtering the vehicles caught
-- - 3 = Calculating what vehicle speed to show based on modes -- - 3 = Calculating what vehicle speed to show based on modes
radarStage = 0, ]] 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 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) -- vehicle IDs for the player using entity enumeration (see cl_utils.lua)