diff options
| author | orwell96 <orwell@bleipb.de> | 2017-12-18 21:44:36 +0100 |
|---|---|---|
| committer | orwell96 <orwell@bleipb.de> | 2017-12-18 23:09:23 +0100 |
| commit | 46c4447da089146c662f217bf3269d78d4c462c2 (patch) | |
| tree | e846a588b6ddfb03c456b0c3c4d0653cd3402b85 /advtrains/atc.lua | |
| parent | faa60e2bd4d35054f23fda68c06a601f2a197257 (diff) | |
| download | advtrains-46c4447da089146c662f217bf3269d78d4c462c2.tar.gz advtrains-46c4447da089146c662f217bf3269d78d4c462c2.tar.bz2 advtrains-46c4447da089146c662f217bf3269d78d4c462c2.zip | |
Rewrite rail connection system...
...to support an arbitrary number of connections for rails, which leads to these new features:
- switches now get recognized by the trackworker correctly
- ability to add real rail crosses
During this, I also rewrote the rail registering system and the conway function (important part of path prediction)
Note, developers: the track preset format changed, you might need to rewrite them according to the presets in tracks.lua if you wrote your own
(possibly breaks advcarts)
Diffstat (limited to 'advtrains/atc.lua')
| -rw-r--r-- | advtrains/atc.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/advtrains/atc.lua b/advtrains/atc.lua index c8f7c90..bdcf144 100644 --- a/advtrains/atc.lua +++ b/advtrains/atc.lua @@ -124,8 +124,8 @@ advtrains.atc_function = function(def, preset, suffix, rotation) meta:set_string("formspec", atc.get_atc_controller_formspec(pos, meta)) local pts=minetest.pos_to_string(pos) - local _, conn1=advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) - atc.controllers[pts]={command=fields.command, arrowconn=conn1} + local _, conns=advtrains.get_rail_info_at(pos, advtrains.all_tracktypes) + atc.controllers[pts]={command=fields.command, arrowconn=conns[1].c} if advtrains.detector.on_node[pts] then atc.send_command(pos) end @@ -145,8 +145,8 @@ function atc.get_atc_controller_formspec(pos, meta) local command=meta:get_string("command") local command_on=meta:get_string("command_on") local channel=meta:get_string("channel") - local formspec="size[8,6]".. - "dropdown[0,0;3;mode;static,mesecon,digiline;"..mode.."]" + local formspec="size[8,6]" + -- "dropdown[0,0;3;mode;static,mesecon,digiline;"..mode.."]" if mode<3 then formspec=formspec.."field[0.5,1.5;7,1;command;"..attrans("Command")..";"..minetest.formspec_escape(command).."]" if tonumber(mode)==2 then |