aboutsummaryrefslogtreecommitdiff
path: root/advtrains_interlocking/approach.lua
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2020-01-30 13:59:46 +0100
committerorwell96 <orwell@bleipb.de>2021-02-10 16:36:24 +0100
commitaee7f0d4198c441c3dd4cb5d33f488607a1a81a5 (patch)
tree4a0d1eecb99885e88f3f00c606fffc7d07cd5c00 /advtrains_interlocking/approach.lua
parent119a09b784ad3f3c6bfd327f32164cb099f47f10 (diff)
downloadadvtrains-aee7f0d4198c441c3dd4cb5d33f488607a1a81a5.tar.gz
advtrains-aee7f0d4198c441c3dd4cb5d33f488607a1a81a5.tar.bz2
advtrains-aee7f0d4198c441c3dd4cb5d33f488607a1a81a5.zip
Fix things, rework signal aspect select dialog, transform old aspects on-the-fly
Diffstat (limited to 'advtrains_interlocking/approach.lua')
-rw-r--r--advtrains_interlocking/approach.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/advtrains_interlocking/approach.lua b/advtrains_interlocking/approach.lua
index 151f15a..14a31ce 100644
--- a/advtrains_interlocking/approach.lua
+++ b/advtrains_interlocking/approach.lua
@@ -75,13 +75,13 @@ advtrains.tnc_register_on_approach(function(pos, id, train, index, has_entered,
--shunt move
if asp.shunt then
nspd = SHUNT_SPEED_MAX
- elseif asp.shunt.proceed_as_main and asp.main != 0 then
+ elseif asp.proceed_as_main and asp.main ~= 0 then
nspd = asp.main
travsht = false
end
else
--train move
- if asp.main != 0 then
+ if asp.main ~= 0 then
nspd = asp.main
elseif asp.shunt then
nspd = SHUNT_SPEED_MAX
@@ -98,6 +98,7 @@ advtrains.tnc_register_on_approach(function(pos, id, train, index, has_entered,
end
--atdebug("ns,ts", nspd, travspd)
+
lspd = travspd
local udata = {signal_pos = spos}