From 5738ab46aa5c768b973ef892635fb1642c5f6b9c Mon Sep 17 00:00:00 2001 From: orwell96 Date: Fri, 15 Mar 2019 18:17:18 +0100 Subject: Disable-ARS switch in signal and set this when cancelling an ARS route --- advtrains_interlocking/ars.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'advtrains_interlocking/ars.lua') diff --git a/advtrains_interlocking/ars.lua b/advtrains_interlocking/ars.lua index ef5d0da..5bb56fa 100644 --- a/advtrains_interlocking/ars.lua +++ b/advtrains_interlocking/ars.lua @@ -114,8 +114,16 @@ function advtrains.interlocking.ars_check(sigd, train) local tcbs = il.db.get_tcbs(sigd) if not tcbs or not tcbs.routes then return end + if tcbs.ars_disabled then + -- No-ARS mode of signal. + -- ignore... + return + end + if tcbs.routeset then -- ARS is not in effect when a route is already set + -- just "punch" routesetting, just in case callback got lost. + minetest.after(0, il.route.update_route, sigd, tcbs, nil, nil) return end @@ -124,8 +132,5 @@ function advtrains.interlocking.ars_check(sigd, train) --delay routesetting, it should not occur inside train step -- using after here is OK because that gets called on every path recalculation minetest.after(0, il.route.update_route, sigd, tcbs, rteid, nil) - else - -- just "punch" routesetting, just in case callback got lost. - minetest.after(0, il.route.update_route, sigd, tcbs, nil, nil) end end -- cgit v1.2.3