Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: don't allow free-wagon-chains to exceed max-train-length (#8533)

Browse Source 
This makes no sense, that a free-wagon-chain could be larger than
the maximum length of a train, as you cannot put an engine in
front of that anyway. And it prevents run-away AIs making very
silly long free-wagon-chains.
This commit is contained in:
Patric Stout 2021-01-11 20:58:00 +01:00 committed by GitHub
parent 760b0cdc11
commit cd36e17160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/train_cmd.cpp
View File

@ -646,8 +646,9 @@ static CommandCost CmdBuildRailWagon(TileIndex tile, DoCommandFlag flags, const
w->engine_type == e->index && ///< Same type w->engine_type == e->index && ///< Same type
w->First() != v && ///< Don't connect to ourself w->First() != v && ///< Don't connect to ourself
!(w->vehstatus & VS_CRASHED)) { ///< Not crashed/flooded !(w->vehstatus & VS_CRASHED)) { ///< Not crashed/flooded
DoCommand(0, v->index | 1 << 20, w->Last()->index, DC_EXEC, CMD_MOVE_RAIL_VEHICLE); if (DoCommand(0, v->index | 1 << 20, w->Last()->index, DC_EXEC, CMD_MOVE_RAIL_VEHICLE).Succeeded()) {
break; break;
}
} }
} }
} }
@ -959,12 +960,25 @@ static CommandCost CheckNewTrain(Train *original_dst, Train *dst, Train *origina
static CommandCost CheckTrainAttachment(Train *t) static CommandCost CheckTrainAttachment(Train *t)
{ {
/* No multi-part train, no need to check. */ /* No multi-part train, no need to check. */
if (t == nullptr || t->Next() == nullptr || !t->IsEngine()) return CommandCost(); if (t == nullptr || t->Next() == nullptr) return CommandCost();
/* The maximum length for a train. For each part we decrease this by one /* The maximum length for a train. For each part we decrease this by one
* and if the result is negative the train is simply too long. */ * and if the result is negative the train is simply too long. */
int allowed_len = _settings_game.vehicle.max_train_length * TILE_SIZE - t->gcache.cached_veh_length; int allowed_len = _settings_game.vehicle.max_train_length * TILE_SIZE - t->gcache.cached_veh_length;
/* For free-wagon chains, check if they are within the max_train_length limit. */
if (!t->IsEngine()) {
t = t->Next();
while (t != nullptr) {
allowed_len -= t->gcache.cached_veh_length;
t = t->Next();
}
if (allowed_len < 0) return_cmd_error(STR_ERROR_TRAIN_TOO_LONG);
return CommandCost();
}
Train *head = t; Train *head = t;
Train *prev = t; Train *prev = t;