mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r17721) -Codechange: replace a magic number with a constant

This commit is contained in:
rubidium 2009-10-06 17:28:06 +00:00
parent 5f59d0c5b4
commit e0e5eae1ee
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargopacket.cpp
View File

@ -92,7 +92,7 @@ void CargoList::Append(CargoPacket *cp)
assert(cp != NULL);
for (List::iterator it = packets.begin(); it != packets.end(); it++) {
if ((*it)->SameSource(cp) && (*it)->count + cp->count <= 65535) {
if ((*it)->SameSource(cp) && (*it)->count + cp->count <= CargoPacket::MAX_COUNT) {
(*it)->count += cp->count;
(*it)->feeder_share += cp->feeder_share;
delete cp;

2
src/cargopacket.h
View File

@ -45,6 +45,8 @@ private:
/** We want this to be saved, right? */
friend const struct SaveLoad *GetCargoPacketDesc();
public:
/** Maximum number of items in a single cargo packet. */
static const uint16 MAX_COUNT = UINT16_MAX;
TileIndex source_xy; ///< The origin of the cargo (first station in feeder chain)
TileIndex loaded_at_xy; ///< Location where this cargo has been loaded into the vehicle