diff --git a/cl_radar.lua b/cl_radar.lua index 2a34a2c..831b29c 100644 --- a/cl_radar.lua +++ b/cl_radar.lua @@ -612,7 +612,7 @@ function RADAR:GetVehiclesForAntenna() table.sort( vehs[ant], self:GetFastestSortFunc() ) for k, v in pairs( vehs[ant] ) do - if ( self:CheckVehicleDataFitsMode( ant, v.rayType ) and v.veh ~= results[ant][1].veh and v.size + 0.5 < results[ant][1].size ) then + if ( self:CheckVehicleDataFitsMode( ant, v.rayType ) and v.veh ~= results[ant][1].veh and v.size + 0.75 < results[ant][1].size ) then results[ant][2] = v break end @@ -713,9 +713,14 @@ function RADAR:Main() local data = {} -- Get the player's vehicle speed - local speed = self:GetVehSpeedFormatted( GetEntitySpeed( PLY.veh ) ) + local entSpeed = GetEntitySpeed( PLY.veh ) - data.patrolSpeed = UTIL:FormatSpeed( speed ) + if ( entSpeed == 0 ) then + data.patrolSpeed = "¦[]" + else + local speed = self:GetVehSpeedFormatted( entSpeed ) + data.patrolSpeed = UTIL:FormatSpeed( speed ) + end -- Only grab data to send if there have actually been vehicles captured by the radar if ( not UTIL:IsTableEmpty( self:GetCapturedVehicles() ) ) then @@ -827,7 +832,12 @@ Citizen.CreateThread( function() if ( av[ant] ~= nil and av[ant][i] ~= nil ) then local pos = GetEntityCoords( av[ant][i].veh ) local r = RADAR:GetDynamicRadius( av[ant][i].veh ) - UTIL:DrawDebugSphere( pos.x, pos.y, pos.z, r, { 255, 0, 0, 100 } ) + + if ( i == 1 ) then + UTIL:DrawDebugSphere( pos.x, pos.y, pos.z, r, { 255, 127, 0, 100 } ) + else + UTIL:DrawDebugSphere( pos.x, pos.y, pos.z, r, { 255, 0, 0, 100 } ) + end end end end diff --git a/nui/radar.js b/nui/radar.js index e5aeade..c386dc9 100644 --- a/nui/radar.js +++ b/nui/radar.js @@ -208,7 +208,7 @@ function setAntennaMode( ant, mode ) setLight( ant, "modes", "opp", mode == modes.opp ); } -function setAntennaFastLabel( ant, state ) +function setAntennaFastMode( ant, state ) { setLight( ant, "fast", "fastLabel", state ); } @@ -234,7 +234,7 @@ function updateDisplays( ps, ants ) e.targetSpeed.html( ants[ant][0].speed ); e.fastSpeed.html( ants[ant][1].speed ); - setAntennaFastLabel( ant, ants[ant][1].speed == "¦¦¦" ? false : true ); + // setAntennaFastLabel( ant, ants[ant][1].speed == "¦¦¦" ? false : true ); setAntennaDirs( ant, ants[ant][0].dir, ants[ant][1].dir ); } @@ -267,8 +267,11 @@ function poweredUp() { clearEverything(); - setAntennaXmit( "front", false ); - setAntennaXmit( "rear", false ); + for ( let ant of [ "front", "rear" ] ) + { + setAntennaXmit( ant, false ); + setAntennaFastMode( ant, true ); + } } function radarPower( state )