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

Merge branch 'order_occupancy-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-01-24 02:52:05 +00:00
parent 73e8c32a5d 8adf5e23a4
commit 9826c2481e
5 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vehicle.cpp
View File

@@ -2476,6 +2476,7 @@ void Vehicle::LeaveStation()
new_occupancy /= 100;
}
if (new_occupancy + 1 != old_occupancy) {
this->order_occupancy_average = 0;
real_current_order->SetOccupancy(static_cast<uint8>(new_occupancy + 1));
for (const Vehicle *v = this->FirstShared(); v != NULL; v = v->NextShared()) {
SetWindowDirty(WC_VEHICLE_ORDERS, v->index);
@@ -2486,6 +2487,25 @@ void Vehicle::LeaveStation()
this->MarkDirty();
}
void Vehicle::RecalculateOrderOccupancyAverage()
{
uint num_valid = 0;
uint total = 0;
uint order_count = this->GetNumOrders();
for (uint i = 0; i < order_count; i++) {
uint occupancy = this->GetOrder(i)->GetOccupancy();
if (occupancy > 0) {
num_valid++;
total += (occupancy - 1);
}
}
if (num_valid > 0) {
this->order_occupancy_average = 16 + ((total + (num_valid / 2)) / num_valid);
} else {
this->order_occupancy_average = 1;
}
}
/**
* Reset all refit_cap in the consist to cargo_cap.
*/