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

Add drive-through train depot emulation (default off)

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-09-26 17:56:58 +01:00
parent b6f583a799
commit 84dd35b685
10 changed files with 93 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/train_cmd.cpp
View File

@@ -2598,6 +2598,12 @@ static bool CheckTrainStayInDepot(Train *v)
return true;
}
if (v->reverse_distance > 0) {
v->reverse_distance--;
if (v->reverse_distance == 0) SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
return true;
}
SigSegState seg_state;
if (v->force_proceed == TFP_NONE) {
@@ -2628,6 +2634,53 @@ static bool CheckTrainStayInDepot(Train *v)
return true;
}
if (_settings_game.pf.pathfinder_for_trains == VPF_YAPF && _settings_game.vehicle.drive_through_train_depot) {
const TileIndex depot_tile = v->tile;
const DiagDirection depot_dir = GetRailDepotDirection(depot_tile);
const DiagDirection behind_depot_dir = ReverseDiagDir(depot_dir);
const int depot_z = GetTileMaxZ(depot_tile);
const TileIndexDiffC tile_diff = TileIndexDiffCByDiagDir(behind_depot_dir);
TileIndex behind_depot_tile = depot_tile;
uint skipped = 0;
while (true) {
TileIndex tile = AddTileIndexDiffCWrap(behind_depot_tile, tile_diff);
if (tile == INVALID_TILE) break;
if (!IsRailDepotTile(tile)) break;
DiagDirection dir = GetRailDepotDirection(tile);
if (dir != depot_dir && dir != behind_depot_dir) break;
if (!HasBit(v->compatible_railtypes, GetRailType(tile))) break;
if (GetTileMaxZ(tile) != depot_z) break;
behind_depot_tile = tile;
skipped++;
}
if (skipped > 0 && GetRailDepotDirection(behind_depot_tile) == behind_depot_dir &&
YapfTrainCheckDepotReverse(v, depot_tile, behind_depot_tile)) {
Direction direction = DiagDirToDir(behind_depot_dir);
int x = TileX(behind_depot_tile) * TILE_SIZE | _vehicle_initial_x_fract[behind_depot_dir];
int y = TileY(behind_depot_tile) * TILE_SIZE | _vehicle_initial_y_fract[behind_depot_dir];
if (v->gcache.cached_total_length < skipped * TILE_SIZE) {
int delta = (skipped * TILE_SIZE) - v->gcache.cached_total_length;
int speed = max(1, v->GetCurrentMaxSpeed());
v->reverse_distance = (1 + (((192 * 3 / 2) * delta) / speed));
SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, WID_VV_START_STOP);
}
for (Train *u = v; u != nullptr; u = u->Next()) {
u->tile = behind_depot_tile;
u->direction = direction;
u->x_pos = x;
u->y_pos = y;
}
InvalidateWindowData(WC_VEHICLE_DEPOT, depot_tile);
InvalidateWindowData(WC_VEHICLE_DEPOT, behind_depot_tile);
return true;
}
}
/* Only leave when we can reserve a path to our destination. */
if (seg_state == SIGSEG_PBS && !TryPathReserve(v) && v->force_proceed == TFP_NONE) {
/* No path and no force proceed. */