summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-10-06 21:12:35 +0000
committerrubidium <rubidium@openttd.org>2009-10-06 21:12:35 +0000
commitd52fa73bb14314d80811482c840fc6fc3e485b80 (patch)
tree7bfb453b27ff4451e843880a367922832353be53
parent31acc42b21105ced6bdc65bbb903cc71d57a99e3 (diff)
downloadopenttd-d52fa73bb14314d80811482c840fc6fc3e485b80.tar.xz
(svn r17731) -Codechange: do not cache a boolean which states whether some other variable is not 0.
-rw-r--r--src/cargopacket.cpp5
-rw-r--r--src/cargopacket.h5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index 134238990..79c31d9d8 100644
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -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, uint count, CargoList::MoveToAction mta,
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++) {
diff --git a/src/cargopacket.h b/src/cargopacket.h
index c5d0bf822..7f8114c2d 100644
--- a/src/cargopacket.h
+++ b/src/cargopacket.h
@@ -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;
}
/**