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

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

This commit is contained in:
rubidium 2009-10-06 21:12:35 +00:00
parent 31acc42b21
commit d52fa73bb1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cargopacket.cpp
View File

@ -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++) {

5
src/cargopacket.h
View File

@ -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;
}
/**