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

Adjust stopped/depot detection for running costs division

Browse Source 
Fix v/this use in Train::GetRunningCost
This commit is contained in:
Jonathan G Rennison
2021-11-18 23:41:12 +00:00
parent f16657ec96
commit bb8e4eb18a
4 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/roadveh_cmd.cpp
View File

@@ -2131,11 +2131,15 @@ Money RoadVehicle::GetRunningCost() const
uint cost_factor = GetVehicleProperty(this, PROP_ROADVEH_RUNNING_COST_FACTOR, e->u.road.running_cost);
if (cost_factor == 0) return 0;
/* running costs if in depot */
if (IsRoadDepotTile(this->tile)) cost_factor /= _settings_game.difficulty.vehicle_costs_in_depot;
/* running costs if stopped */
if ((this->cur_speed == 0) && !(IsRoadDepotTile(this->tile))) cost_factor /= _settings_game.difficulty.vehicle_costs_when_stopped;
if (this->cur_speed == 0) {
if (this->IsInDepot()) {
/* running costs if in depot */
cost_factor /= _settings_game.difficulty.vehicle_costs_in_depot;
} else {
/* running costs if stopped */
cost_factor /= _settings_game.difficulty.vehicle_costs_when_stopped;
}
}
return GetPrice(e->u.road.running_cost_class, cost_factor, e->GetGRF());
}