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

Don't treat loading trains specially when enabling realistic braking

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-01-28 22:27:23 +00:00
parent 62fffddb3f
commit 9506a33443
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings.cpp
View File

@@ -1120,13 +1120,13 @@ static bool TrainBrakingModelChanged(int32 p1)
for (Train *v : Train::Iterate()) { for (Train *v : Train::Iterate()) {
v_cur = v; v_cur = v;
if (!v->IsPrimaryVehicle() || (v->vehstatus & VS_CRASHED) != 0 || HasBit(v->subtype, GVSF_VIRTUAL) || v->track == TRACK_BIT_DEPOT) continue; if (!v->IsPrimaryVehicle() || (v->vehstatus & VS_CRASHED) != 0 || HasBit(v->subtype, GVSF_VIRTUAL) || v->track == TRACK_BIT_DEPOT) continue;
TryPathReserve(v, v->current_order.GetType() != OT_LOADING, HasStationTileRail(v->tile)); TryPathReserve(v, true, HasStationTileRail(v->tile));
} }
_long_reserve_disabled = false; _long_reserve_disabled = false;
for (Train *v : Train::Iterate()) { for (Train *v : Train::Iterate()) {
v_cur = v; v_cur = v;
if (!v->IsPrimaryVehicle() || (v->vehstatus & VS_CRASHED) != 0 || HasBit(v->subtype, GVSF_VIRTUAL) || v->track == TRACK_BIT_DEPOT) continue; if (!v->IsPrimaryVehicle() || (v->vehstatus & VS_CRASHED) != 0 || HasBit(v->subtype, GVSF_VIRTUAL) || v->track == TRACK_BIT_DEPOT) continue;
TryPathReserve(v, v->current_order.GetType() != OT_LOADING, HasStationTileRail(v->tile)); TryPathReserve(v, true, HasStationTileRail(v->tile));
if (v->lookahead != nullptr) SetBit(v->lookahead->flags, TRLF_APPLY_ADVISORY); if (v->lookahead != nullptr) SetBit(v->lookahead->flags, TRLF_APPLY_ADVISORY);
} }
} else if (p1 == TBM_ORIGINAL && (_game_mode == GM_NORMAL || _game_mode == GM_EDITOR)) { } else if (p1 == TBM_ORIGINAL && (_game_mode == GM_NORMAL || _game_mode == GM_EDITOR)) {
@@ -1142,7 +1142,7 @@ static bool TrainBrakingModelChanged(int32 p1)
_settings_game.vehicle.train_braking_model = TBM_REALISTIC; _settings_game.vehicle.train_braking_model = TBM_REALISTIC;
FreeTrainTrackReservation(v); FreeTrainTrackReservation(v);
_settings_game.vehicle.train_braking_model = p1; _settings_game.vehicle.train_braking_model = p1;
TryPathReserve(v, v->current_order.GetType() != OT_LOADING, HasStationTileRail(v->tile)); TryPathReserve(v, true, HasStationTileRail(v->tile));
} else { } else {
v->lookahead.reset(); v->lookahead.reset();
} }