aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Pérez-Cerezo <gabriel@gpcf.eu>2020-07-24 11:25:37 +0200
committerGabriel Pérez-Cerezo <gabriel@gpcf.eu>2020-07-24 11:25:37 +0200
commit7e83b718a6f4e571c70db6b551889005e42e230e (patch)
treed25cc2e1adce53b11453ee19419e56ed7875290e
parent9d52770f211f6290fc172e82bad00daed0853848 (diff)
parent3c9215f037b90bd7e9e802930872827354b12711 (diff)
downloadadvtrains-7e83b718a6f4e571c70db6b551889005e42e230e.tar.gz
advtrains-7e83b718a6f4e571c70db6b551889005e42e230e.tar.bz2
advtrains-7e83b718a6f4e571c70db6b551889005e42e230e.zip
Merge branch 'master' of bananach.space:advtrains
-rw-r--r--advtrains_interlocking/signal_api.lua10
1 files changed, 10 insertions, 0 deletions
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index 90bfaf4..9729195 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -175,6 +175,11 @@ local function fillout_aspect(asp)
asp.main = {
free = true,
}
+ elseif type(asp.main) ~= "table" then
+ asp.main = {
+ free = asp.main~=0,
+ speed = asp.main,
+ }
end
if not asp.dst then
asp.dst = {
@@ -186,6 +191,11 @@ local function fillout_aspect(asp)
free = false,
proceed_as_main = false,
}
+ elseif type(asp.shunt) ~= "table" then
+ asp.shunt = {
+ free = asp.shunt,
+ proceed_as_main = asp.proceed_as_main,
+ }
end
if not asp.info then
asp.info = {}