equal
deleted
inserted
replaced
955 !(u->vehstatus & VS_STOPPED) && |
955 !(u->vehstatus & VS_STOPPED) && |
956 u->cur_speed != 0) { |
956 u->cur_speed != 0) { |
957 return; |
957 return; |
958 } |
958 } |
959 |
959 |
|
960 /* Trams can't overtake other trams */ |
|
961 if (v->u.road.roadtype == ROADTYPE_TRAM) return; |
|
962 |
960 if (v->direction != u->direction || !(v->direction & 1)) return; |
963 if (v->direction != u->direction || !(v->direction & 1)) return; |
961 |
964 |
962 /* Check if vehicle is in a road stop, depot, tunnel or bridge or not on a straight road */ |
965 /* Check if vehicle is in a road stop, depot, tunnel or bridge or not on a straight road */ |
963 if (v->u.road.state >= RVSB_IN_ROAD_STOP || !IsStraightRoadTrackdir((Trackdir)(v->u.road.state & RVSB_TRACKDIR_MASK))) return; |
966 if (v->u.road.state >= RVSB_IN_ROAD_STOP || !IsStraightRoadTrackdir((Trackdir)(v->u.road.state & RVSB_TRACKDIR_MASK))) return; |
964 |
967 |