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

TBTR: Avoid articulated/rear units being added to tile hash

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-06-11 01:59:17 +01:00
parent 9519c5c1fb
commit 5a2e498182
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/articulated_vehicles.cpp
View File

@@ -427,6 +427,8 @@ void AddArticulatedParts(Vehicle *first)
} }
t->refit_cap = 0; t->refit_cap = 0;
if (front->IsVirtual()) t->SetVirtual();
t->SetArticulatedPart(); t->SetArticulatedPart();
break; break;
} }

3
src/train_cmd.cpp
View File

@@ -917,6 +917,7 @@ static void AddRearEngineToMultiheadedTrain(Train *v)
u->random_bits = VehicleRandomBits(); u->random_bits = VehicleRandomBits();
v->SetMultiheaded(); v->SetMultiheaded();
u->SetMultiheaded(); u->SetMultiheaded();
if (v->IsVirtual()) u->SetVirtual();
v->SetNext(u); v->SetNext(u);
u->UpdatePosition(); u->UpdatePosition();
@@ -5195,6 +5196,7 @@ Train* CmdBuildVirtualRailWagon(const Engine *e)
v->SetWagon(); v->SetWagon();
v->SetFreeWagon(); v->SetFreeWagon();
v->SetVirtual();
v->cargo_type = e->GetDefaultCargoType(); v->cargo_type = e->GetDefaultCargoType();
v->cargo_cap = rvi->capacity; v->cargo_cap = rvi->capacity;
@@ -5281,6 +5283,7 @@ Train* CmdBuildVirtualRailVehicle(EngineID eid, StringID &error)
v->SetFrontEngine(); v->SetFrontEngine();
v->SetEngine(); v->SetEngine();
v->SetVirtual();
if (rvi->railveh_type == RAILVEH_MULTIHEAD) { if (rvi->railveh_type == RAILVEH_MULTIHEAD) {
AddRearEngineToMultiheadedTrain(v); AddRearEngineToMultiheadedTrain(v);