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

TBTR: Fix use vehicles from depot function being overly aggressive

Browse Source 
Do not use vehicles which have orders/shared orders, or are in a group
This commit is contained in:
Jonathan G Rennison
2021-01-10 18:36:09 +00:00
parent dd16145b03
commit e4555a1749
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tbtr_template_vehicle_func.cpp
View File

@@ -269,6 +269,20 @@ Train* ChainContainsEngine(EngineID eid, Train *chain) {
return nullptr;
}
static bool IsTrainUsableAsTemplateReplacementSource(const Train *t)
{
if (t->IsFreeWagon()) return true;
if (t->IsPrimaryVehicle() && t->IsStoppedInDepot()) {
if (t->GetNumOrders() != 0) return false;
if (t->IsOrderListShared()) return false;
if (t->group_id != DEFAULT_GROUP) return false;
return true;
}
return false;
}
// has O(n^2)
Train* DepotContainsEngine(TileIndex tile, EngineID eid, Train *not_in = nullptr)
{
@@ -278,7 +292,7 @@ Train* DepotContainsEngine(TileIndex tile, EngineID eid, Train *not_in = nullptr
if (t->tile == tile
// If the veh belongs to a chain, wagons will not return true on IsStoppedInDepot(), only primary vehicles will
// in case of t not a primary veh, we demand it to be a free wagon to consider it for replacement
&& ((t->IsPrimaryVehicle() && t->IsStoppedInDepot()) || t->IsFreeWagon())
&& IsTrainUsableAsTemplateReplacementSource(t)
&& t->engine_type == eid
&& (not_in == nullptr || ChainContainsVehicle(not_in, t) == false)) {
return t;