From f0c8a4a0861ce87b5437b9afe5d253cf5c710218 Mon Sep 17 00:00:00 2001
From: Dan <WolfKnight98@users.noreply.github.com>
Date: Wed, 27 Nov 2019 21:23:33 +0000
Subject: [PATCH] All speed zones displayed, 'HLd' shown when in hold

---
 cl_radar.lua | 33 +++++++++++++++++++++++++--------
 nui/radar.js | 10 ++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/cl_radar.lua b/cl_radar.lua
index 0d19d65..2920ae3 100644
--- a/cl_radar.lua
+++ b/cl_radar.lua
@@ -665,16 +665,12 @@ end )
 
 RegisterNUICallback( "setAntennaMode", function( data ) 
 	RADAR:SetAntennaMode( data.value, tonumber( data.mode ) )
-
-	print( "Set antenna: " .. data.value .. " to mode " .. tostring( data.mode ) )
 end )
 
 RegisterNUICallback( "toggleAntenna", function( data ) 
 	RADAR:ToggleAntenna( data.value )
 
 	SendNUIMessage( { _type = "antennaXmit", ant = data.value, on = RADAR:IsAntennaTransmitting( data.value ) } )
-
-	print( "Toggled " .. data.value .. " antenna" )
 end )
 
 
@@ -715,15 +711,36 @@ function RADAR:Main()
 			end
 
 			-- Work out what has to be sent 
+			-- need to find a way to automate this in a loop 
 			local av = self:GetActiveVehicles()
 			local test = { ["front"] = {}, ["rear"] = {} }
 
-			if ( av["front"][1] ~= nil ) then 
-				test["front"].speed = UTIL:FormatSpeed( self:GetVehSpeedFormatted( av["front"][1].speed ) ) 
+			if ( self:IsAntennaTransmitting( "front" ) ) then 
+				if ( av["front"][1] ~= nil ) then 
+					test["front"].speed = UTIL:FormatSpeed( self:GetVehSpeedFormatted( av["front"][1].speed ) ) 
+				else
+					test["front"].speed = "¦¦¦"
+				end 
+
+				if ( av["front"][2] ~= nil ) then 
+					test["front"].fast = UTIL:FormatSpeed( self:GetVehSpeedFormatted( av["front"][2].speed ) ) 
+				else 
+					test["front"].fast = "¦¦¦"
+				end 
 			end 
 
-			if ( av["front"][2] ~= nil ) then 
-				test["front"].fast = UTIL:FormatSpeed( self:GetVehSpeedFormatted( av["front"][2].speed ) ) 
+			if ( self:IsAntennaTransmitting( "rear" ) ) then 
+				if ( av["rear"][1] ~= nil ) then 
+					test["rear"].speed = UTIL:FormatSpeed( self:GetVehSpeedFormatted( av["rear"][1].speed ) ) 
+				else 
+					test["rear"].speed = "¦¦¦"
+				end 
+
+				if ( av["rear"][2] ~= nil ) then 
+					test["rear"].fast = UTIL:FormatSpeed( self:GetVehSpeedFormatted( av["rear"][2].speed ) ) 
+				else 
+					test["rear"].fast = "¦¦¦"
+				end 
 			end
 
 			-- Send the update to the NUI side
diff --git a/nui/radar.js b/nui/radar.js
index 3252a09..70ff65b 100644
--- a/nui/radar.js
+++ b/nui/radar.js
@@ -128,6 +128,8 @@ function setAntennaXmit( ant, state )
     if ( !state ) {
         elements.antennas[ant].targetSpeed.html( "¦¦¦" );
         elements.antennas[ant].fast.speed.html( "HLd" ); 
+    } else {
+        elements.antennas[ant].fast.speed.html( "¦¦¦" ); 
     }
 }
 
@@ -142,6 +144,14 @@ function updateDisplays( ps, ants )
     if ( ants["front"].fast != null ) {
         elements.antennas["front"].fast.speed.html( ants["front"].fast );
     }    
+
+    if ( ants["rear"].speed != null ) {
+        elements.antennas["rear"].targetSpeed.html( ants["rear"].speed ); 
+    }
+
+    if ( ants["rear"].fast != null ) {
+        elements.antennas["rear"].fast.speed.html( ants["rear"].fast );
+    } 
 }
 
 // This function is used to send data back through to the LUA side