From e37f4f9188808c3a91be55ba90b9b666341af3cf Mon Sep 17 00:00:00 2001
From: orwell96 <orwell@bleipb.de>
Date: Tue, 4 Dec 2018 19:27:44 +0100
Subject: Apply speed restriction 0.5 indexes later, do not cap tarvelocity by
 speed_restriction

---
 advtrains/trainlogic.lua       | 6 +++---
 advtrains_interlocking/lzb.lua | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/advtrains/trainlogic.lua b/advtrains/trainlogic.lua
index 8cfad4c..a55c5dc 100644
--- a/advtrains/trainlogic.lua
+++ b/advtrains/trainlogic.lua
@@ -390,9 +390,9 @@ function advtrains.train_step_b(id, train, dtime)
 		end
 	end
 	
-	if tarvel_cap and train.tarvelocity and tarvel_cap<train.tarvelocity then
-		train.tarvelocity=tarvel_cap
-	end
+	--if tarvel_cap and train.tarvelocity and tarvel_cap<train.tarvelocity then
+	--	train.tarvelocity=tarvel_cap
+	--end
 	
 	local tmp_lever
 	
diff --git a/advtrains_interlocking/lzb.lua b/advtrains_interlocking/lzb.lua
index 18fda55..14c1741 100644
--- a/advtrains_interlocking/lzb.lua
+++ b/advtrains_interlocking/lzb.lua
@@ -162,7 +162,7 @@ local function apply_control(id, train)
 	
 	local i = 1
 	while i<=#lzb.oncoming do
-		if lzb.oncoming[i].idx < train.index then
+		if lzb.oncoming[i].idx < train.index-0.5 then
 			if not lzb.oncoming[i].npr then
 				train.speed_restriction = lzb.oncoming[i].spd
 			end
-- 
cgit v1.2.3