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/train_cmd.cpp
View File

@@ -6456,11 +6456,15 @@ Money Train::GetRunningCost() const
/* Halve running cost for multiheaded parts */
if (v->IsMultiheaded()) cost_factor /= 2;
/* running costs if in depot */
if (v->track == TRACK_BIT_DEPOT) cost_factor /= _settings_game.difficulty.vehicle_costs_in_depot;
/* running costs if stopped */
if ((v->cur_speed == 0) && !(v->track == TRACK_BIT_DEPOT)) 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;
}
}
cost += GetPrice(e->u.rail.running_cost_class, cost_factor, e->GetGRF());
} while ((v = v->GetNextVehicle()) != nullptr);