dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17801) -Codechange: for StationCargoLists the 'loaded_at_xy' does not matter when merging CargoPackets

Browse Source
This commit is contained in:
rubidium
2009-10-18 14:30:37 +00:00
parent e553983e39
commit be57392ba3
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargopacket.cpp
View File

@@ -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;