Quote from: prissi on September 28, 2025, 03:19:53 AMI think one needs to compare the wares' catg, not the good index. Also I found the logic a little convoluted, as it has to be either two line ore not. How about// not same via halt, but maybe same lines
for (linehandle_t const& line : h->registered_lines) {
if (line->get_goods_catg_index().is_contained(ware.get_catg())) {
// only merge if both can travel with the same line to their stop
bool has_line1 = w_next->registered_lines.is_contained(line);
bool has_line2 = wi_next->registered_lines.is_contained(line);
merge = has_line1 && has_line2;
has_line = has_line1 || has_line2;
}
}
// not same via halt, but maybe same lines
for (linehandle_t const& line : h->registered_lines) {
if (line->get_goods_catg_index().is_contained(ware.get_catg())) {
// only merge if both can travel with the same line to their stop
bool has_line1 = w_next->registered_lines.is_contained(line);
bool has_line2 = wi_next->registered_lines.is_contained(line);
has_line = has_line || has_line1 || has_line2;
if (has_line1 || has_line2)
merge = has_line1 && has_line2;
if (has_line1 ^ has_line2)
break;
}
}
- Do not overwrite has_line (that was my mistake). // not same via halt, but maybe same lines
for (linehandle_t const& line : h->registered_lines) {
if (line->get_goods_catg_index().is_contained(ware.get_catg())) {
// only merge if both can travel with the same line to their stop
bool has_line1 = w_next->registered_lines.is_contained(line);
bool has_line2 = wi_next->registered_lines.is_contained(line);
merge = has_line1 && has_line2;
has_line = has_line1 || has_line2;
}
}
const int richtung = ribi_type(get_pos(), pos_next);
in vehicle/rail_vehicle.cc, l438.const int richtung = ribi_type(cnv->get_route()->at(start_block),cnv->get_route()->at(start_block+1));
then, pre-signal can always check next choose-signal.QuoteSep 23 18:46:11 m11 postfix/smtpd[78804]: NOQUEUE: reject: RCPT from unknown[69.30.245.114]: 450 4.7.25 Client host rejected: cannot find your hostname, [69.30.245.114]; from=<daychilde...deleted....com> to=<... deletet ...> proto=ESMTP helo=<s1.mh1.one>I have now configured an exception for 69.30.245.114, now the mails arrive.