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

Fix VehiclePositionIsAllowed triggering assertions on virtual trains.

Browse Source 
This fixes the bug where a bankruptcy/company reset when another
company owned a virtual train caused an assertion failure.
This commit is contained in:
Jonathan G Rennison
2016-03-10 00:03:40 +00:00
parent 910edffee0
commit 320233fc9b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/infrastructure.cpp
View File

@@ -98,8 +98,10 @@ void PayDailyTrackSharingFee(Train *v)
*/ */
static bool VehiclePositionIsAllowed(const Vehicle *v, Owner owner = INVALID_OWNER) static bool VehiclePositionIsAllowed(const Vehicle *v, Owner owner = INVALID_OWNER)
{ {
if (!IsValidTile(v->tile)) return true;
switch (v->type) { switch (v->type) {
case VEH_TRAIN: case VEH_TRAIN:
if (HasBit(Train::From(v)->subtype, GVSF_VIRTUAL)) return true;
for (const Vehicle *u = v; u != NULL; u = u->Next()) { for (const Vehicle *u = v; u != NULL; u = u->Next()) {
if (!IsInfraTileUsageAllowed(VEH_TRAIN, v->owner, u->tile) || GetTileOwner(u->tile) == owner) return false; if (!IsInfraTileUsageAllowed(VEH_TRAIN, v->owner, u->tile) || GetTileOwner(u->tile) == owner) return false;
} }