gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-10 08:17:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25419) -Fix: assign some random other source station to packets which have lost their source

Browse Source
This commit is contained in:
fonsinchen 2013-06-15 20:48:50 +00:00
parent e06ad1dda1
commit c9452bbbff
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cargopacket.cpp
View File

@ -450,6 +450,11 @@ bool VehicleCargoList::Stage(bool accepted, StationID current_station, StationID
assert((cargo_next != next_station || cargo_next == INVALID_STATION) && assert((cargo_next != next_station || cargo_next == INVALID_STATION) &&
cargo_next != current_station); cargo_next != current_station);
} else { } else {
/* Rewrite an invalid source station to some random other one to
* avoid keeping the cargo in the vehicle forever. */
if (cp->source == INVALID_STATION && !ge->flows.empty()) {
cp->source = ge->flows.begin()->first;
}
cargo_next = ge->GetVia(cp->source); cargo_next = ge->GetVia(cp->source);
if (cargo_next == INVALID_STATION) { if (cargo_next == INVALID_STATION) {
action = (accepted && cp->source != current_station) ? MTA_DELIVER : MTA_KEEP; action = (accepted && cp->source != current_station) ? MTA_DELIVER : MTA_KEEP;