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

(svn r4120) Use the new station functions where appropriate

Browse Source
This commit is contained in:
tron
2006-03-26 19:20:15 +00:00
parent 8f60df1817
commit cda8934a55
12 changed files with 38 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roadveh_cmd.c
View File

@@ -1088,8 +1088,7 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir
goto do_it;
}
} else if (IsTileType(desttile, MP_STATION)) {
if (IS_BYTE_INSIDE(_m[desttile].m5, 0x43, 0x4B)) {
/* We are heading for a station */
if (IsRoadStop(desttile)) {
dir = GetRoadStationDir(desttile);
do_it:;
/* When we are heading for a depot or station, we just
@@ -1321,7 +1320,7 @@ again:
v->cur_speed = 0;
return;
}
if (IS_BYTE_INSIDE(_m[v->tile].m5, 0x43, 0x4B)) {
if (IsRoadStop(v->tile)) {
RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile));
// reached a loading bay, mark it as used and clear the usage bit