cpp/openttd-patchpack/source Changeset - r13214:4d6bd80fcf2a

Changeset - r13214:4d6bd80fcf2a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

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

(svn r17731) -Codechange: do not cache a boolean which states whether some other variable is not 0.

2 files changed with 4 insertions and 6 deletions:

src/cargopacket.cpp

src/cargopacket.h

0 comments (0 inline, 0 general)

src/cargopacket.cpp

➞

Show inline comments

@@ @@ -78,7 +78,7 @@ CargoList::~CargoList() @@
 void CargoList::AgeCargo()
+{
-	if (this->empty) return;
+	if (this->Empty()) return;
 	uint dit = 0;
 	for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {
@@ @@ -214,12 +214,11 @@ bool CargoList::MoveTo(CargoList *dest, @@
 void CargoList::InvalidateCache()
+{
 	this->empty = this->packets.empty();
 	this->count = 0;
 	this->feeder_share = 0;
 	this->days_in_transit = 0;
 	if (this->empty) return;
+	if (this->packets.empty()) return;
 	uint dit = 0;
 	for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {

src/cargopacket.h

➞

Show inline comments

@@ @@ -163,7 +163,6 @@ public: @@
 private:
 	List packets;         ///< The cargo packets in this list
 	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
 	uint days_in_transit; ///< Cache for the number of days in transit
@@ @@ -197,7 +196,7 @@ public: @@
 	 */
 	FORCEINLINE bool Empty() const
+	{
-		return this->empty;
+		return this->count == 0;
+	}
 	/**
@@ @@ -224,7 +223,7 @@ public: @@
 	 */
 	FORCEINLINE StationID Source() const
+	{
-		return this->Empty() ? INVALID_STATION : this->packets.front()->source;;
 		return this->Empty() ? INVALID_STATION : this->packets.front()->source;
+	}
 	/**

0 comments (0 inline, 0 general)