From f76de82679ba51aa95c529201ecf3cfc4be01ae9 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 18 Oct 2009 14:30:37 +0000 Subject: (svn r17801) -Codechange: for StationCargoLists the 'loaded_at_xy' does not matter when merging CargoPackets --- src/cargopacket.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cargopacket.cpp') 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::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; -- cgit v1.2.3-70-g09d2