From 7ce52ca8b7cd711bbe44a3de65ed092df36250bc Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Sun, 1 Jul 2007 12:25:08 +0000
Subject: [PATCH] (svn r10404) -Fix (r10266): Adding a cargo packet to cargo
 list could overflow. Now we detect this and just leave the cargo in its own
 packet.

---
 src/cargopacket.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index 0de5b279dd..b316b02976 100644
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -228,7 +228,7 @@ void CargoList::Append(CargoPacket *cp)
 	assert(cp->IsValid());
 
 	for (List::iterator it = packets.begin(); it != packets.end(); it++) {
-		if ((*it)->SameSource(cp)) {
+		if ((*it)->SameSource(cp) && (*it)->count + cp->count <= 65535) {
 			(*it)->count        += cp->count;
 			(*it)->feeder_share += cp->feeder_share;
 			delete cp;