dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

6
src/roadveh_cmd.cpp
View File

@@ -436,7 +436,7 @@ bool RoadVehicle::FindClosestDepot(TileIndex *location, DestinationID *destinati
if (rfdd.best_length == UINT_MAX) return false;
if (location != NULL) *location = rfdd.tile;
if (destination != NULL) *destination = Depot::GetByTile(rfdd.tile)->index;
if (destination != NULL) *destination = GetDepotIndex(rfdd.tile);
return true;
}
@@ -1850,7 +1850,7 @@ static void CheckIfRoadVehNeedsService(RoadVehicle *v)
return;
}
const Depot *depot = Depot::GetByTile(rfdd.tile);
DepotID depot = GetDepotIndex(rfdd.tile);
if (v->current_order.IsType(OT_GOTO_DEPOT) &&
v->current_order.GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS &&
@@ -1861,7 +1861,7 @@ static void CheckIfRoadVehNeedsService(RoadVehicle *v)
if (v->current_order.IsType(OT_LOADING)) v->LeaveStation();
ClearSlot(v);
v->current_order.MakeGoToDepot(depot->index, ODTFB_SERVICE);
v->current_order.MakeGoToDepot(depot, ODTFB_SERVICE);
v->dest_tile = rfdd.tile;
InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);
}