Merge remote-tracking branch 'origin/experimental' into make-gui-work

This commit is contained in:
Will Berry
2023-03-13 15:32:09 -04:00
2 changed files with 9 additions and 4 deletions

View File

@@ -390,15 +390,20 @@ function set_station_from_comb(station)
local is_stack = bit_extract(bits, SETTING_IS_STACK) > 0
local enable_inactive = bit_extract(bits, SETTING_ENABLE_INACTIVE) > 0
station.network_name = signal and signal.name or nil
station.allows_all_trains = allows_all_trains
station.is_stack = is_stack
station.enable_inactive = enable_inactive
station.is_p = (is_pr_state == 0 or is_pr_state == 1) or nil
station.is_r = (is_pr_state == 0 or is_pr_state == 2) or nil
if station.network_name == NETWORK_EACH then
station.network_flag = {}
local new_name = signal and signal.name or nil
if station.network_name ~= new_name then
station.network_name = new_name
if station.network_name == NETWORK_EACH then
station.network_flag = {}
else
station.network_flag = 0
end
end
end
---NOTE: does not check .valid

View File

@@ -133,7 +133,7 @@ local function on_station_built(map_data, stop, comb1, comb2)
r_threshold = 0,
locked_slots = 0,
--network_name = set_station_from_comb,
--network_flag = set_station_from_comb,
network_flag = 0,
wagon_combs = nil,
deliveries = {},
accepted_layouts = {},