aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2018-10-25 22:38:44 +0200
committerorwell96 <orwell@bleipb.de>2018-10-25 22:38:44 +0200
commit69f368ab34614539c1dde8442fb56efa66bebe6d (patch)
tree16883d7eb5f935c7c3a40ecbc933c61ad5552afd
parentfe4b4a695af2df5a9c0c43efb9255bbdbf783a12 (diff)
downloadadvtrains-69f368ab34614539c1dde8442fb56efa66bebe6d.tar.gz
advtrains-69f368ab34614539c1dde8442fb56efa66bebe6d.tar.bz2
advtrains-69f368ab34614539c1dde8442fb56efa66bebe6d.zip
Display route_rsn when denying routesetting by subroute locked.
-rw-r--r--advtrains_interlocking/routesetting.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 2c61041..7dc6672 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -55,7 +55,7 @@ function ilrs.set_route(signal, route, try)
if c_ts.route then
if not try then atwarn("Encountered ts lock during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
- return false, "Section '"..c_ts.name.."' already has route set from "..sigd_to_string(c_ts.route.origin).."!", c_ts_id, nil
+ return false, "Section '"..c_ts.name.."' already has route set from "..sigd_to_string(c_ts.route.origin)..":\n"..c_ts.route.rsn, c_ts_id, nil
end
if c_ts.trains and #c_ts.trains>0 then
if not try then atwarn("Encountered ts occupied during a real run of routesetting routine, at ts=",c_ts_id,"while setting route",rtename,"of",signal) end
@@ -224,14 +224,14 @@ end
local asp_generic_free = {
main = {
free = true,
- speed = 100,
+ speed = -1,
},
shunt = {
free = false,
},
dst = {
free = true,
- speed = 100,
+ speed = -1,
},
info = {}
}