cpp/openttd-patchpack/source File Diff

File diff r21241:2d4224921bbf → r21242:f9186ba6c34b

src/cargoaction.cpp

➞

Show inline comments

 	if (cp_new == NULL) cp_new = cp;
 	if (cp_new->NextStation() == this->avoid || cp_new->NextStation() == this->avoid2) {
 		cp->SetNextStation(this->ge->GetVia(cp_new->SourceStation(), this->avoid, this->avoid2));
+	}
 	if (this->source != this->destination) {
 		this->source->RemoveFromMeta(cp_new, VehicleCargoList::MTA_TRANSFER, cp_new->Count());
 		this->source->AddToMeta(cp_new, VehicleCargoList::MTA_TRANSFER);
 		this->destination->action_counts[VehicleCargoList::MTA_TRANSFER] += cp_new->Count();
 		this->destination->AddToMeta(cp_new, VehicleCargoList::MTA_TRANSFER);
+	}
 	/* Legal, as front pushing doesn't invalidate iterators in std::list. */
 	this->destination->packets.push_front(cp_new);
 	return cp_new == cp;
+}