src/cargopacket.cpp
changeset 7626 baab18f2a00c
parent 7529 5a277cbe8d8f
child 7870 57194f624020
equal deleted inserted replaced
7625:1dba39e8e1e2 7626:baab18f2a00c
   226 {
   226 {
   227 	assert(cp != NULL);
   227 	assert(cp != NULL);
   228 	assert(cp->IsValid());
   228 	assert(cp->IsValid());
   229 
   229 
   230 	for (List::iterator it = packets.begin(); it != packets.end(); it++) {
   230 	for (List::iterator it = packets.begin(); it != packets.end(); it++) {
   231 		if ((*it)->SameSource(cp)) {
   231 		if ((*it)->SameSource(cp) && (*it)->count + cp->count <= 65535) {
   232 			(*it)->count        += cp->count;
   232 			(*it)->count        += cp->count;
   233 			(*it)->feeder_share += cp->feeder_share;
   233 			(*it)->feeder_share += cp->feeder_share;
   234 			delete cp;
   234 			delete cp;
   235 
   235 
   236 			InvalidateCache();
   236 			InvalidateCache();