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

(svn r18388) -Codechange: move entering/leaving of road stops to functions of RoadStop

Browse Source
This commit is contained in:
rubidium
2009-12-02 23:53:15 +00:00
parent edc7de7936
commit aa40d8e3ad
6 changed files with 89 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/roadveh_cmd.cpp
View File

@@ -465,13 +465,7 @@ void RoadVehicle::UpdateDeltaXY(Direction direction)
static void ClearCrashedStation(RoadVehicle *v)
{
RoadStop *rs = RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile));
/* Mark the station entrance as not busy */
rs->SetEntranceBusy(false);
/* Free the parking bay */
rs->FreeBay(HasBit(v->state, RVS_USING_SECOND_BAY));
RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v);
}
static void DeleteLastRoadVeh(RoadVehicle *v)
@@ -1317,17 +1311,7 @@ again:
v->cur_speed = 0;
return false;
}
if (IsRoadStop(v->tile)) {
RoadStop *rs = RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile));
/* Vehicle is leaving a road stop tile, mark bay as free
* For drive-through stops, only do it if the vehicle stopped here */
if (IsStandardRoadStopTile(v->tile) || HasBit(v->state, RVS_IS_STOPPING)) {
rs->FreeBay(HasBit(v->state, RVS_USING_SECOND_BAY));
ClrBit(v->state, RVS_IS_STOPPING);
}
if (IsStandardRoadStopTile(v->tile)) rs->SetEntranceBusy(false);
}
if (IsRoadStop(v->tile)) RoadStop::GetByTile(v->tile, GetRoadStopType(v->tile))->Leave(v);
}
if (!HasBit(r, VETS_ENTERED_WORMHOLE)) {