Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3681) - [Multistop] Check the RoadStop type before check its status. This fixes an assert introduced in r3663. Also fix the return type of GetRoadStopType().

Browse Source
This commit is contained in:
peter1138 2006-02-27 19:43:19 +00:00
parent 263741bf9b
commit 23b13d3f42
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
roadveh_cmd.c
View File

@ -986,9 +986,12 @@ static int RoadFindPathToDest(Vehicle *v, TileIndex tile, int enterdir)
} else if (IsTileType(tile, MP_STATION) && IsRoadStationTile(tile)) { } else if (IsTileType(tile, MP_STATION) && IsRoadStationTile(tile)) {
if (IsTileOwner(tile, v->owner)) { if (IsTileOwner(tile, v->owner)) {
/* Our station */ /* Our station */
const RoadStop *rs = GetRoadStopByTile(tile, (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK); RoadStopType rstype = (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK;
if (rs != NULL && (_patches.roadveh_queue || GB(rs->status, 0, 2) != 0)) { if (GetRoadStopType(tile) == rstype) {
bitmask |= _road_veh_fp_ax_or[GetRoadStationDir(tile)]; const RoadStop *rs = GetRoadStopByTile(tile, rstype);
if (rs != NULL && (_patches.roadveh_queue || GB(rs->status, 0, 2) != 0)) {
bitmask |= _road_veh_fp_ax_or[GetRoadStationDir(tile)];
}
} }
} }
} }

2
station.h
View File

@ -196,7 +196,7 @@ uint GetStationPlatforms(const Station *st, TileIndex tile);
void StationPickerDrawSprite(int x, int y, RailType railtype, int image); void StationPickerDrawSprite(int x, int y, RailType railtype, int image);
RoadStop * GetRoadStopByTile(TileIndex tile, RoadStopType type); RoadStop * GetRoadStopByTile(TileIndex tile, RoadStopType type);
static inline int GetRoadStopType(TileIndex tile) static inline RoadStopType GetRoadStopType(TileIndex tile)
{ {
return (_m[tile].m5 < 0x47) ? RS_TRUCK : RS_BUS; return (_m[tile].m5 < 0x47) ? RS_TRUCK : RS_BUS;
} }