mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r17731) -Codechange: do not cache a boolean which states whether some other variable is not 0.
This commit is contained in:
parent
31acc42b21
commit
d52fa73bb1
|
@ -78,7 +78,7 @@ CargoList::~CargoList()
|
||||||
|
|
||||||
void CargoList::AgeCargo()
|
void CargoList::AgeCargo()
|
||||||
{
|
{
|
||||||
if (this->empty) return;
|
if (this->Empty()) return;
|
||||||
|
|
||||||
uint dit = 0;
|
uint dit = 0;
|
||||||
for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {
|
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()
|
void CargoList::InvalidateCache()
|
||||||
{
|
{
|
||||||
this->empty = this->packets.empty();
|
|
||||||
this->count = 0;
|
this->count = 0;
|
||||||
this->feeder_share = 0;
|
this->feeder_share = 0;
|
||||||
this->days_in_transit = 0;
|
this->days_in_transit = 0;
|
||||||
|
|
||||||
if (this->empty) return;
|
if (this->packets.empty()) return;
|
||||||
|
|
||||||
uint dit = 0;
|
uint dit = 0;
|
||||||
for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {
|
for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {
|
||||||
|
|
|
@ -163,7 +163,6 @@ public:
|
||||||
private:
|
private:
|
||||||
List packets; ///< The cargo packets in this list
|
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
|
uint count; ///< Cache for the number of cargo entities
|
||||||
Money feeder_share; ///< Cache for the feeder share
|
Money feeder_share; ///< Cache for the feeder share
|
||||||
uint days_in_transit; ///< Cache for the number of days in transit
|
uint days_in_transit; ///< Cache for the number of days in transit
|
||||||
|
@ -197,7 +196,7 @@ public:
|
||||||
*/
|
*/
|
||||||
FORCEINLINE bool Empty() const
|
FORCEINLINE bool Empty() const
|
||||||
{
|
{
|
||||||
return this->empty;
|
return this->count == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -224,7 +223,7 @@ public:
|
||||||
*/
|
*/
|
||||||
FORCEINLINE StationID Source() const
|
FORCEINLINE StationID Source() const
|
||||||
{
|
{
|
||||||
return this->Empty() ? INVALID_STATION : this->packets.front()->source;;
|
return this->Empty() ? INVALID_STATION : this->packets.front()->source;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue