diff options
| author | Y. Wang <yw05@forksworld.de> | 2022-07-03 12:45:27 +0200 |
|---|---|---|
| committer | Y. Wang <yw05@forksworld.de> | 2023-03-23 20:06:02 +0100 |
| commit | 875968f078ef89b13afae6d02a2dabe5ea7897cb (patch) | |
| tree | 5b3c43ace046b595d09291e1af0e0a0136d7e13a /advtrains_interlocking/routesetting.lua | |
| parent | bd20da95ec5e1c113a57b7ac2c75d08b87cbf793 (diff) | |
| download | advtrains-875968f078ef89b13afae6d02a2dabe5ea7897cb.tar.gz advtrains-875968f078ef89b13afae6d02a2dabe5ea7897cb.tar.bz2 advtrains-875968f078ef89b13afae6d02a2dabe5ea7897cb.zip | |
Unassign distant signals when canceling route
Diffstat (limited to 'advtrains_interlocking/routesetting.lua')
| -rw-r--r-- | advtrains_interlocking/routesetting.lua | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua index f1b4455..4ce6fd3 100644 --- a/advtrains_interlocking/routesetting.lua +++ b/advtrains_interlocking/routesetting.lua @@ -113,7 +113,7 @@ function ilrs.set_route(signal, route, try) } if c_tcbs.signal then c_tcbs.route_committed = true - c_tcbs.aspect = route.aspect or advtrains.interlocking.GENERIC_FREE + c_tcbs.aspect = route.aspect or advtrains.interlocking.FULL_FREE c_tcbs.route_origin = signal advtrains.interlocking.update_signal_aspect(c_tcbs) signals[#signals+1] = c_tcbs.signal @@ -138,7 +138,7 @@ function ilrs.set_route(signal, route, try) if lastsig then local pos = signals[i] local _, assigned_by = advtrains.distant.get_main(pos) - if assigned_by ~= "manual" then + if not assigned_by or assigned_by == "routesetting" then advtrains.distant.assign(lastsig, signals[i], "routesetting") end end @@ -251,6 +251,13 @@ function ilrs.cancel_route_from(sigd) c_tcbs.route_origin = nil advtrains.interlocking.update_signal_aspect(c_tcbs) + if c_tcbs.signal then + local pos = c_tcbs.signal + local _, assigned_by = advtrains.distant.get_main(pos) + if assigned_by == "routesetting" then + advtrains.distant.unassign_dst(pos) + end + end c_ts_id = c_tcbs.ts_id if not c_tcbs then |