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

Fix incorrect train weight used for infrastructure sharing track fees

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-04-18 18:00:01 +01:00
parent 0150f8f570
commit 6056a00222
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/infrastructure.cpp
View File

@@ -60,21 +60,6 @@ void PayStationSharingFee(Vehicle *v, const Station *st)
PaySharingFee(v, st->owner, (cost << 8) / DAY_TICKS); PaySharingFee(v, st->owner, (cost << 8) / DAY_TICKS);
} }
uint16_t is2_GetWeight(Train *v)
{
uint16_t weight = (CargoSpec::Get(v->cargo_type)->weight * v->cargo.StoredCount() * FreightWagonMult(v->cargo_type)) / 16;
/* Vehicle weight is not added for articulated parts. */
if (!v->IsArticulatedPart()) {
weight += GetVehicleProperty(v, PROP_TRAIN_WEIGHT, RailVehInfo(v->engine_type)->weight);
}
/* Powered wagons have extra weight added. */
if (HasBit(v->flags, VRF_POWEREDWAGON)) {
weight += RailVehInfo(v->gcache.first_engine)->pow_wag_weight;
}
return weight;
}
/** /**
* Pay the daily fee for trains on foreign tracks. * Pay the daily fee for trains on foreign tracks.
* @param v The vehicle to pay the fee for. * @param v The vehicle to pay the fee for.
@@ -85,9 +70,9 @@ void PayDailyTrackSharingFee(Train *v)
if (owner == v->owner) return; if (owner == v->owner) return;
Money cost = _settings_game.economy.sharing_fee[VEH_TRAIN] << 8; Money cost = _settings_game.economy.sharing_fee[VEH_TRAIN] << 8;
/* Cost is calculated per 1000 tonnes */ /* Cost is calculated per 1000 tonnes */
cost = cost * is2_GetWeight(v) / 1000; cost = (cost * v->gcache.cached_weight) / 1000;
/* Only pay the required fraction */ /* Only pay the required fraction */
cost = cost * v->running_ticks / DAY_TICKS; cost = (cost * v->running_ticks) / DAY_TICKS;
if (cost != 0) PaySharingFee(v, owner, cost); if (cost != 0) PaySharingFee(v, owner, cost);
} }