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

(svn r10974) -Fix [FS#1144, FS#1155]: road vehicles that could not (properly) use a road stop still tried to go to that road stop.

Browse Source
This commit is contained in:
rubidium
2007-08-24 19:19:18 +00:00
parent 6c061ecfb4
commit 8a86526d05
4 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/station.h
View File

@@ -70,6 +70,8 @@ struct RoadStop : PoolItem<RoadStop, RoadStopID, &_RoadStop_pool> {
void FreeBay(uint nr);
bool IsEntranceBusy() const;
void SetEntranceBusy(bool busy);
RoadStop *GetNextRoadStop(const Vehicle *v) const;
};
struct StationSpecList {
@@ -102,17 +104,19 @@ struct StationRect : public Rect {
};
struct Station : PoolItem<Station, StationID, &_Station_pool> {
public:
RoadStop *GetPrimaryRoadStop(RoadStop::Type type) const
{
return type == RoadStop::BUS ? bus_stops : truck_stops;
}
public:
RoadStop *GetPrimaryRoadStop(RoadStop::Type type) const
{
return type == RoadStop::BUS ? bus_stops : truck_stops;
}
const AirportFTAClass *Airport() const
{
if (airport_tile == 0) return GetAirport(AT_DUMMY);
return GetAirport(airport_type);
}
RoadStop *GetPrimaryRoadStop(const Vehicle *v) const;
const AirportFTAClass *Airport() const
{
if (airport_tile == 0) return GetAirport(AT_DUMMY);
return GetAirport(airport_type);
}
TileIndex xy;
RoadStop *bus_stops;