Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonathan G Rennison 2019-05-16 20:04:48 +01:00
parent 8afb21cf9c
commit 34d7f12a70
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/economy.cpp
View File

@ -130,6 +130,7 @@ Money CalculateCompanyValue(const Company *c, bool including_loan)
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->owner != owner) continue;
if (HasBit(v->subtype, GVSF_VIRTUAL)) continue;
if (v->type == VEH_TRAIN ||
v->type == VEH_ROAD ||
@ -170,7 +171,7 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)
FOR_ALL_VEHICLES(v) {
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->age > 730) {
/* Find the vehicle with the lowest amount of profit */
@ -483,7 +484,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
if (v->IsEngineCountable()) {
GroupStatistics::CountEngine(v, 1);
}
if (v->IsPrimaryVehicle()) {
if (v->IsPrimaryVehicle() && !HasBit(v->subtype, GVSF_VIRTUAL)) {
GroupStatistics::CountVehicle(v, 1);
v->unitnumber = unitidgen[v->type].NextID();
}