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

Removed rest of radar stage code

Browse Source
This commit is contained in:
Dan
2019-12-03 15:18:53 +00:00
parent 95fd11ed21
commit d4770391a5
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cl_radar.lua
View File

@@ -124,13 +124,6 @@ RADAR.vars =
-- vehicle IDs for the player using entity enumeration (see cl_utils.lua) -- vehicle IDs for the player using entity enumeration (see cl_utils.lua)
vehiclePool = {}, vehiclePool = {},
-- Radar stage, this is used to tell the system what it should currently be doing, the stages are:
-- - 0 = Gathering vehicles hit by the rays
-- - 1 = Filtering the vehicles caught (removing duplicates, etc) and calculating what needs to be shown
-- to the user based on modes and settings
-- - 2 = Sending all required data across to the NUI system for display
radarStage = 0,
-- Ray trace state, this is used so the radar stage doesn't progress to the next stage unless -- Ray trace state, this is used so the radar stage doesn't progress to the next stage unless
-- all of the ray trace threads have completed -- all of the ray trace threads have completed
rayTraceState = 0, rayTraceState = 0,
@@ -503,22 +496,6 @@ function RADAR:UpdateRayEndCoords()
end end
--[[------------------------------------------------------------------------
Radar stage functions
------------------------------------------------------------------------]]--
function RADAR:GetRadarStage()
return self.vars.radarStage
end
function RADAR:IncreaseRadarStage()
self.vars.radarStage = self.vars.radarStage + 1
end
function RADAR:ResetRadarStage()
self.vars.radarStage = 0
end
--[[------------------------------------------------------------------------ --[[------------------------------------------------------------------------
Radar antenna functions Radar antenna functions
------------------------------------------------------------------------]]-- ------------------------------------------------------------------------]]--
@@ -931,7 +908,7 @@ Citizen.CreateThread( function()
end ) end )
function RADAR:RunThreads() function RADAR:RunThreads()
if ( DoesEntityExist( PLY.veh ) and PLY.inDriverSeat and PLY.vehClassValid and self:CanPerformMainTask() ) then if ( DoesEntityExist( PLY.veh ) and PLY.inDriverSeat and PLY.vehClassValid and self:CanPerformMainTask() and self:IsEitherAntennaOn() ) then
if ( self:GetRayTraceState() == 0 ) then if ( self:GetRayTraceState() == 0 ) then
local vehs = self:GetVehiclePool() local vehs = self:GetVehiclePool()
@@ -941,7 +918,6 @@ function RADAR:RunThreads()
Citizen.Wait( self:GetThreadWaitTime() ) Citizen.Wait( self:GetThreadWaitTime() )
elseif ( self:GetRayTraceState() == self:GetNumOfRays() ) then elseif ( self:GetRayTraceState() == self:GetNumOfRays() ) then
-- self:IncreaseRadarStage()
self:ResetRayTraceState() self:ResetRayTraceState()
end end
end end
@@ -1033,7 +1009,6 @@ function RADAR:Main()
SendNUIMessage( { _type = "update", speed = data.patrolSpeed, antennas = data.antennas } ) SendNUIMessage( { _type = "update", speed = data.patrolSpeed, antennas = data.antennas } )
self:ResetTempVehicleIDs() self:ResetTempVehicleIDs()
self:ResetRadarStage()
self:ResetRayTraceState() self:ResetRayTraceState()
end end
end end