From b4534c6f1268c48107b6aa0ec6e8b7960c11075a Mon Sep 17 00:00:00 2001
From: orwell96 <orwell@bleipb.de>
Date: Wed, 17 Oct 2018 18:58:57 +0200
Subject: Improve ATC-LZB-User control interaction, smoothen LZB control
 operations (prevent flickering view when atc battles against lzb)

---
 advtrains/trainhud.lua | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'advtrains/trainhud.lua')

diff --git a/advtrains/trainhud.lua b/advtrains/trainhud.lua
index d880ffc..6332c47 100644
--- a/advtrains/trainhud.lua
+++ b/advtrains/trainhud.lua
@@ -61,6 +61,7 @@ function advtrains.on_control_change(pc, train, flip)
 				act=true
 			else
 				advtrains.invert_train(train.id)
+				advtrains.atc.train_reset_command(train)
 			end
 		end
 		if pc.left then
@@ -178,16 +179,21 @@ function advtrains.hud_train_format(train, flip)
 	local topLine, firstLine
 	
 	local secondLine
-	if train.tarvelocity then
+	if train.tarvelocity or train.atc_command then
 		local b="   "
-		local tvel=advtrains.abs_ceil(train.tarvelocity)
-		local tvel_kmh=advtrains.abs_ceil(advtrains.ms_to_kmh(train.tarvelocity))
+		local tvels=""
+		if train.tarvelocity then
+			local tvel = advtrains.abs_ceil(train.tarvelocity)
+			tvels = "|"..string.rep("+", tvel)..string.rep("_", max-tvel)
+		end
 		if train.atc_brake_target then
 			b="-B-"
 		end
-		secondLine="ATC"..b..": |"..string.rep("+", tvel)..string.rep("_", max-tvel).." > "..tvel_kmh.." km/h"
-	elseif train.atc_delay then
-		secondLine = "ATC waiting "..advtrains.abs_ceil(train.atc_delay).."s"
+		local ad = ""
+		if train.atc_delay then
+			ad = " "..advtrains.abs_ceil(train.atc_delay).."s "
+		end
+		secondLine="ATC"..b..": "..tvels..ad..(train.atc_command or "")
 	else
 		secondLine = "Manual operation"
 	end
-- 
cgit v1.2.3