aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2021-12-31 16:04:04 +0100
committerorwell96 <orwell@bleipb.de>2021-12-31 16:04:04 +0100
commitef8391a60d8221f883d54c68373607d7bb3cf4c7 (patch)
treec30e0cd18af0613053b7b3e35593738ac9c1d595
parent78e0c650e3a3d92facef11ddbf3a58a9dc22bae8 (diff)
downloadadvtrains-ef8391a60d8221f883d54c68373607d7bb3cf4c7.tar.gz
advtrains-ef8391a60d8221f883d54c68373607d7bb3cf4c7.tar.bz2
advtrains-ef8391a60d8221f883d54c68373607d7bb3cf4c7.zip
atc_reset(): Removed unused string parameter and also clear ATC autocouple flag (Cpl)
Fixes H#189 and H#190
-rw-r--r--advtrains/atc.lua1
-rw-r--r--advtrains_luaautomation/atc_rail.lua3
2 files changed, 2 insertions, 2 deletions
diff --git a/advtrains/atc.lua b/advtrains/atc.lua
index 8cb3e8f..c1ff218 100644
--- a/advtrains/atc.lua
+++ b/advtrains/atc.lua
@@ -93,6 +93,7 @@ function atc.train_reset_command(train, keep_tarvel)
train.atc_delay=nil
train.atc_brake_target=nil
train.atc_wait_finish=nil
+ train.atc_wait_autocouple=nil
train.atc_arrow=nil
if not keep_tarvel then
train.tarvelocity=nil
diff --git a/advtrains_luaautomation/atc_rail.lua b/advtrains_luaautomation/atc_rail.lua
index 6c157e3..5dde99c 100644
--- a/advtrains_luaautomation/atc_rail.lua
+++ b/advtrains_luaautomation/atc_rail.lua
@@ -130,9 +130,8 @@ function r.fire_event(pos, evtdata, appr_internal)
get_rc = function()
return train.routingcode
end,
- atc_reset = function(cmd)
+ atc_reset = function()
if not train_id then return false end
- assertt(cmd, "string")
advtrains.atc.train_reset_command(train)
return true
end,