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

Number of rays cached again, added 1 additional trace for same mode

Browse Source
This commit is contained in:
Dan
2019-11-29 20:44:04 +00:00
parent 5bfdbef76a
commit cb6eccfa98
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cl_radar.lua
View File

@@ -112,7 +112,7 @@ RADAR.vars =
-- all of the ray trace threads have completed -- all of the ray trace threads have completed
rayTraceState = 0, rayTraceState = 0,
-- Number of ray traces, automaticaally cached when the system first runs -- Number of ray traces, automatically cached when the system first runs
numberOfRays = 0 numberOfRays = 0
} }
@@ -127,7 +127,8 @@ RADAR.rayTraces = {
-- { startVec = { x = 0.0, y = 5.0 }, endVec = { x = 0.0, y = 150.0 }, rayType = "same" }, -- { startVec = { x = 0.0, y = 5.0 }, endVec = { x = 0.0, y = 150.0 }, rayType = "same" },
-- { startVec = { x = -5.0, y = 15.0 }, endVec = { x = -5.0, y = 150.0 }, rayType = "same" }, -- { startVec = { x = -5.0, y = 15.0 }, endVec = { x = -5.0, y = 150.0 }, rayType = "same" },
-- { startVec = { x = 5.0, y = 15.0 }, endVec = { x = 5.0, y = 150.0 }, rayType = "same" }, -- { startVec = { x = 5.0, y = 15.0 }, endVec = { x = 5.0, y = 150.0 }, rayType = "same" },
{ startVec = { x = 0.0 }, endVec = { x = 0.0, y = 150.0 }, rayType = "same" }, { startVec = { x = 3.0 }, endVec = { x = 3.0, y = 150.0 }, rayType = "same" },
{ startVec = { x = -3.0 }, endVec = { x = -3.0, y = 150.0 }, rayType = "same" },
{ startVec = { x = -10.0 }, endVec = { x = -10.0, y = 150.0 }, rayType = "opp" } { startVec = { x = -10.0 }, endVec = { x = -10.0, y = 150.0 }, rayType = "opp" }
} }
@@ -235,8 +236,12 @@ function RADAR:GetRayTraceState()
return self.vars.rayTraceState return self.vars.rayTraceState
end end
function RADAR:CacheNumRays()
self.vars.numberOfRays = #self.rayTraces
end
function RADAR:GetNumOfRays() function RADAR:GetNumOfRays()
return #self.rayTraces return self.vars.numberOfRays
end end
function RADAR:IncreaseRayTraceState() function RADAR:IncreaseRayTraceState()
@@ -686,7 +691,7 @@ function RADAR:Main()
local plyVehPos = GetEntityCoords( PLY.veh ) local plyVehPos = GetEntityCoords( PLY.veh )
-- First stage of the radar - get all of the vehicles hit by the radar -- First stage of the radar - get all of the vehicles hit by the radar
if ( self:GetRadarStage() == 0 --[[ and self:IsEitherAntennaOn() ]] ) then if ( self:GetRadarStage() == 0 ) then
if ( self:GetRayTraceState() == 0 ) then if ( self:GetRayTraceState() == 0 ) then
local vehs = self:GetVehiclePool() local vehs = self:GetVehiclePool()
@@ -773,6 +778,8 @@ end )
Citizen.CreateThread( function() Citizen.CreateThread( function()
SetNuiFocus( false, false ) SetNuiFocus( false, false )
RADAR:CacheNumRays()
while ( true ) do while ( true ) do
RADAR:Main() RADAR:Main()