diff options
| author | rubidium <rubidium@openttd.org> | 2009-10-18 14:30:37 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-10-18 14:30:37 +0000 |
| commit | f76de82679ba51aa95c529201ecf3cfc4be01ae9 (patch) | |
| tree | e2a328bd6034f49df52bde239369b96741157502 /src/cargopacket.cpp | |
| parent | 138e7233bce5ff5a9d20f54af80f6104303d6ca0 (diff) | |
| download | openttd-f76de82679ba51aa95c529201ecf3cfc4be01ae9.tar.xz | |
(svn r17801) -Codechange: for StationCargoLists the 'loaded_at_xy' does not matter when merging CargoPackets
Diffstat (limited to 'src/cargopacket.cpp')
| -rw-r--r-- | src/cargopacket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index f37df719a..313e7db4f 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -111,7 +111,7 @@ void CargoList<Tinst>::Append(CargoPacket *cp) for (List::iterator it = this->packets.begin(); it != this->packets.end(); it++) { CargoPacket *icp = *it; - if (icp->SameSource(cp) && icp->count + cp->count <= CargoPacket::MAX_COUNT) { + if (Tinst::AreMergable(icp, cp) && icp->count + cp->count <= CargoPacket::MAX_COUNT) { icp->count += cp->count; icp->feeder_share += cp->feeder_share; |