dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17733) -Codechange: store the 'days in transit' cache as the sum of the days in transit instead of the average; the variable isn't requested that often (primarily station NewGRFs) that the dividing/testing for dividing by 0 step needs to be cached.

Browse Source
This commit is contained in:
rubidium
2009-10-06 21:24:03 +00:00
parent 0a621eae7e
commit 702deb8366
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cargopacket.cpp
View File

@@ -78,14 +78,13 @@ CargoList::~CargoList()
void CargoList::AgeCargo()
{
if (this->Empty()) return;
uint dit = 0;
for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {
if ((*it)->days_in_transit != 0xFF) (*it)->days_in_transit++;
dit += (*it)->days_in_transit * (*it)->count;
/* If we're at the maximum, then we can't increase no more. */
if ((*it)->days_in_transit == 0xFF) continue;
(*it)->days_in_transit++;
this->cargo_days_in_transit += (*it)->count;
}
this->days_in_transit = dit / count;
}
void CargoList::Append(CargoPacket *cp)
@@ -216,15 +215,11 @@ void CargoList::InvalidateCache()
{
this->count = 0;
this->feeder_share = 0;
this->days_in_transit = 0;
this->cargo_days_in_transit = 0;
if (this->packets.empty()) return;
uint dit = 0;
for (List::const_iterator it = this->packets.begin(); it != this->packets.end(); it++) {
this->count += (*it)->count;
dit += (*it)->days_in_transit * (*it)->count;
this->feeder_share += (*it)->feeder_share;
this->count += (*it)->count;
this->cargo_days_in_transit += (*it)->days_in_transit * (*it)->count;
this->feeder_share += (*it)->feeder_share;
}
this->days_in_transit = dit / count;
}