cpp/openttd-patchpack/source Changeset - r13213:72dc9a4d9448

Changeset - r13213:72dc9a4d9448

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-10-06 21:06:26
rubidium@openttd.org

(svn r17730) -Codechange: do not cache the source of a packet in the cargo list. It's only used for (some) GUI/NewGRF purposes so precalculating it costs more than calculating when it's actually used.

2 files changed with 1 insertions and 4 deletions:

src/cargopacket.cpp

src/cargopacket.h

0 comments (0 inline, 0 general)

src/cargopacket.cpp

➞

Show inline comments

@@ @@ -217,7 +217,6 @@ void CargoList::InvalidateCache() @@
 	this->empty = this->packets.empty();
 	this->count = 0;
 	this->feeder_share = 0;
 	this->source = INVALID_STATION;
 	this->days_in_transit = 0;
 	if (this->empty) return;
@@ @@ -229,5 +228,4 @@ void CargoList::InvalidateCache() @@
 		this->feeder_share += (*it)->feeder_share;
+	}
 	this->days_in_transit = dit / count;
 	this->source = (*packets.begin())->source;
+}

src/cargopacket.h

➞

Show inline comments

@@ @@ -166,7 +166,6 @@ private: @@
 	bool empty;           ///< Cache for whether this list is empty or not
 	uint count;           ///< Cache for the number of cargo entities
 	Money feeder_share;   ///< Cache for the feeder share
 	StationID source;     ///< Cache for the source of the packet
 	uint days_in_transit; ///< Cache for the number of days in transit
 public:
@@ @@ -225,7 +224,7 @@ public: @@
 	 */
 	FORCEINLINE StationID Source() const
+	{
 		return this->source;
+		return this->Empty() ? INVALID_STATION : this->packets.front()->source;;
+	}
 	/**

0 comments (0 inline, 0 general)