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

TBTR: Skip virtual vehicles in company rating/value and group stats

Browse Source 
(cherry picked from commit 34d7f12a70)
This commit is contained in:
Jonathan G Rennison
2019-05-16 20:04:48 +01:00
parent 835562d81d
commit 2557cec6f3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/economy.cpp
View File

@@ -127,6 +127,7 @@ Money CalculateCompanyValue(const Company *c, bool including_loan)
Vehicle *v; Vehicle *v;
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (v->owner != owner) continue; if (v->owner != owner) continue;
if (HasBit(v->subtype, GVSF_VIRTUAL)) continue;
if (v->type == VEH_TRAIN || if (v->type == VEH_TRAIN ||
v->type == VEH_ROAD || v->type == VEH_ROAD ||
@@ -167,7 +168,7 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
if (v->owner != owner) continue; if (v->owner != owner) continue;
if (IsCompanyBuildableVehicleType(v->type) && v->IsPrimaryVehicle()) { if (IsCompanyBuildableVehicleType(v->type) && v->IsPrimaryVehicle() && !HasBit(v->subtype, GVSF_VIRTUAL)) {
if (v->profit_last_year > 0) num++; // For the vehicle score only count profitable vehicles if (v->profit_last_year > 0) num++; // For the vehicle score only count profitable vehicles
if (v->age > 730) { if (v->age > 730) {
/* Find the vehicle with the lowest amount of profit */ /* Find the vehicle with the lowest amount of profit */
@@ -473,7 +474,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
if (v->IsEngineCountable()) { if (v->IsEngineCountable()) {
GroupStatistics::CountEngine(v, 1); GroupStatistics::CountEngine(v, 1);
} }
if (v->IsPrimaryVehicle()) { if (v->IsPrimaryVehicle() && !HasBit(v->subtype, GVSF_VIRTUAL)) {
GroupStatistics::CountVehicle(v, 1); GroupStatistics::CountVehicle(v, 1);
v->unitnumber = unitidgen[v->type].NextID(); v->unitnumber = unitidgen[v->type].NextID();
} }