petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r17495) -Codechange: replace 'Depot::Get(GetDepotIndex(tile))->index' with GetDepotIndex(tile)

Browse Source
This commit is contained in:
rubidium
2009-09-10 14:37:55 +00:00
parent 751ea62f44
commit 860a538adc
8 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/train_cmd.cpp
View File

@@ -2264,7 +2264,7 @@ bool Train::FindClosestDepot(TileIndex *location, DestinationID *destination, bo
if (tfdd.best_length == UINT_MAX) return false;
if (location != NULL) *location = tfdd.tile;
if (destination != NULL) *destination = Depot::GetByTile(tfdd.tile)->index;
if (destination != NULL) *destination = GetDepotIndex(tfdd.tile);
if (reverse != NULL) *reverse = tfdd.reverse;
return true;
@@ -4526,15 +4526,15 @@ static void CheckIfTrainNeedsService(Train *v)
return;
}
const Depot *depot = Depot::GetByTile(tfdd.tile);
DepotID depot = GetDepotIndex(tfdd.tile);
if (v->current_order.IsType(OT_GOTO_DEPOT) &&
v->current_order.GetDestination() != depot->index &&
v->current_order.GetDestination() != depot &&
!Chance16(3, 16)) {
return;
}
v->current_order.MakeGoToDepot(depot->index, ODTFB_SERVICE);
v->current_order.MakeGoToDepot(depot, ODTFB_SERVICE);
v->dest_tile = tfdd.tile;
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
}