equal
deleted
inserted
replaced
660 } |
660 } |
661 }; |
661 }; |
662 |
662 |
663 static void ShipController(Vehicle *v) |
663 static void ShipController(Vehicle *v) |
664 { |
664 { |
665 GetNewVehiclePosResult gp; |
|
666 uint32 r; |
665 uint32 r; |
667 const byte *b; |
666 const byte *b; |
668 Direction dir; |
667 Direction dir; |
669 Track track; |
668 Track track; |
670 TrackBits tracks; |
669 TrackBits tracks; |
690 |
689 |
691 if (!ShipAccelerate(v)) return; |
690 if (!ShipAccelerate(v)) return; |
692 |
691 |
693 BeginVehicleMove(v); |
692 BeginVehicleMove(v); |
694 |
693 |
695 if (GetNewVehiclePos(v, &gp)) { |
694 GetNewVehiclePosResult gp = GetNewVehiclePos(v); |
|
695 if (gp.old_tile == gp.new_tile) { |
696 /* Staying in tile */ |
696 /* Staying in tile */ |
697 if (IsShipInDepot(v)) { |
697 if (IsShipInDepot(v)) { |
698 gp.x = v->x_pos; |
698 gp.x = v->x_pos; |
699 gp.y = v->y_pos; |
699 gp.y = v->y_pos; |
700 } else { |
700 } else { |