diff options
| author | orwell <orwell@bleipb.de> | 2025-09-28 16:15:46 +0200 |
|---|---|---|
| committer | orwell <orwell@bleipb.de> | 2025-09-28 16:15:46 +0200 |
| commit | 11347bc8a4241038d131340723f3fe6eb71ab211 (patch) | |
| tree | c5fa15d6f6b2da2c003722d70485f46e2a203702 | |
| parent | 8df0a9d75f372f1d325423b5cbdda5abda805050 (diff) | |
| parent | fa58cde9221f544e42e42c11cc7129016676da87 (diff) | |
| download | advtrains-11347bc8a4241038d131340723f3fe6eb71ab211.tar.gz advtrains-11347bc8a4241038d131340723f3fe6eb71ab211.tar.bz2 advtrains-11347bc8a4241038d131340723f3fe6eb71ab211.zip | |
Merge branch 'master' into timetable
| -rw-r--r-- | advtrains_interlocking/route_ui.lua | 4 | ||||
| -rw-r--r-- | advtrains_interlocking/routesetting.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/advtrains_interlocking/route_ui.lua b/advtrains_interlocking/route_ui.lua index 9ecc947..af1c94f 100644 --- a/advtrains_interlocking/route_ui.lua +++ b/advtrains_interlocking/route_ui.lua @@ -140,8 +140,8 @@ function atil.show_route_edit_form(pname, sigd, routeid, sel_rpartidx) -- checkbox for assign distant signal local assign_dst = rseg.assign_dst if assign_dst == nil then - assign_dst = (sel_rpart.seg~=1) -- special behavior when assign_dst is nil (and not false): - -- defaults to false for the very first signal and true for all others (= minimal user configuration overhead) + assign_dst = true -- special behavior when assign_dst is nil (and not false): + -- defaults to true (= minimal user configuration overhead) (changed on 2025-09-23 after some consideration) -- Note: on save, the value will be fixed at either false or true end form = form..string.format("checkbox[4.5,4.0;sa_distant;"..S("Announce distant signal")..";%s]", assign_dst) diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua index 353b521..2332040 100644 --- a/advtrains_interlocking/routesetting.lua +++ b/advtrains_interlocking/routesetting.lua @@ -164,8 +164,8 @@ function ilrs.set_route(signal, route, try) local ndef = advtrains.ndb.get_ndef(c_tcbs.signal) local assign_dst = c_rseg.assign_dst if assign_dst == nil then - assign_dst = (i~=1) -- special behavior when assign_dst is nil (and not false): - -- defaults to false for the very first signal and true for all others (= minimal user configuration overhead) + assign_dst = true -- special behavior when assign_dst is nil (and not false): + -- defaults to true (= minimal user configuration overhead) (changed on 2025-09-23 after some consideration) end local sig_table = { pos = c_tcbs.signal, |