equal
deleted
inserted
replaced
1328 if (v->u.road.state == 255) { |
1328 if (v->u.road.state == 255) { |
1329 GetNewVehiclePosResult gp; |
1329 GetNewVehiclePosResult gp; |
1330 |
1330 |
1331 GetNewVehiclePos(v, &gp); |
1331 GetNewVehiclePos(v, &gp); |
1332 |
1332 |
1333 if (RoadVehFindCloseTo(v, gp.x, gp.y, v->direction) != NULL) { |
1333 const Vehicle *u = RoadVehFindCloseTo(v, gp.x, gp.y, v->direction); |
1334 v->cur_speed = 0; |
1334 if (u != NULL && u->cur_speed < v->cur_speed) { |
|
1335 v->cur_speed = u->cur_speed; |
1335 return; |
1336 return; |
1336 } |
1337 } |
1337 |
1338 |
1338 if ((IsTunnelTile(gp.new_tile) || IsBridgeTile(gp.new_tile)) && VehicleEnterTile(v, gp.new_tile, gp.x, gp.y) & 4) { |
1339 if ((IsTunnelTile(gp.new_tile) || IsBridgeTile(gp.new_tile)) && VehicleEnterTile(v, gp.new_tile, gp.x, gp.y) & 4) { |
1339 //new_dir = RoadGetNewDirection(v, gp.x, gp.y) |
1340 //new_dir = RoadGetNewDirection(v, gp.x, gp.y) |