diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-22 20:22:20 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-22 20:22:20 +0000 |
| commit | 7a37220881c995f317bf5bd0f3077fa6c9e9d098 (patch) | |
| tree | 347d24d175af30acacfedfb4ddf5c9e98d876036 /src/station.cpp | |
| parent | d37b840cf30ea987ab676f1a3631e112cac06244 (diff) | |
| download | openttd-7a37220881c995f317bf5bd0f3077fa6c9e9d098.tar.xz | |
(svn r16390) -Codechange: move u.road to RoadVehicle.
Diffstat (limited to 'src/station.cpp')
| -rw-r--r-- | src/station.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/station.cpp b/src/station.cpp index 8f5dfd3f2..c3a3c4e38 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -114,7 +114,7 @@ RoadStop *Station::GetPrimaryRoadStop(const RoadVehicle *v) const for (; rs != NULL; rs = rs->next) { /* The vehicle cannot go to this roadstop (different roadtype) */ - if ((GetRoadTypes(rs->xy) & v->u.road.compatible_roadtypes) == ROADTYPES_NONE) continue; + if ((GetRoadTypes(rs->xy) & v->compatible_roadtypes) == ROADTYPES_NONE) continue; /* The vehicle is articulated and can therefor not go the a standard road stop */ if (IsStandardRoadStopTile(rs->xy) && RoadVehHasArticPart(v)) continue; @@ -462,7 +462,7 @@ RoadStop::~RoadStop() if (v->type != VEH_ROAD) continue; RoadVehicle *rv = (RoadVehicle *)v; - if (rv->u.road.slot == this) ClearSlot(rv); + if (rv->slot == this) ClearSlot(rv); } } assert(num_vehicles == 0); @@ -542,7 +542,7 @@ RoadStop *RoadStop::GetNextRoadStop(const RoadVehicle *v) const { for (RoadStop *rs = this->next; rs != NULL; rs = rs->next) { /* The vehicle cannot go to this roadstop (different roadtype) */ - if ((GetRoadTypes(rs->xy) & v->u.road.compatible_roadtypes) == ROADTYPES_NONE) continue; + if ((GetRoadTypes(rs->xy) & v->compatible_roadtypes) == ROADTYPES_NONE) continue; /* The vehicle is articulated and can therefor not go the a standard road stop */ if (IsStandardRoadStopTile(rs->xy) && RoadVehHasArticPart(v)) continue; |