diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-11 20:43:14 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-11 20:43:14 +0000 |
| commit | 655b0ccc2ec4cba709a35f4a5fff9f0858a24aa3 (patch) | |
| tree | fab12a7368299932db664475d5c9f6318d508de3 /src/ship_cmd.cpp | |
| parent | 48c8cdfd8470163d7b9a64fbba7f9b27b5499009 (diff) | |
| download | openttd-655b0ccc2ec4cba709a35f4a5fff9f0858a24aa3.tar.xz | |
(svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove.
Diffstat (limited to 'src/ship_cmd.cpp')
| -rw-r--r-- | src/ship_cmd.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 40e0a1697..89bd45f1b 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -588,8 +588,6 @@ static void ShipController(Vehicle *v) if (!ShipAccelerate(v)) return; - BeginVehicleMove(v); - GetNewVehiclePosResult gp = GetNewVehiclePos(v); if (v->u.ship.state != TRACK_BIT_WORMHOLE) { /* Not on a bridge */ @@ -683,8 +681,7 @@ static void ShipController(Vehicle *v) if (!IsTileType(gp.new_tile, MP_TUNNELBRIDGE) || !HasBit(VehicleEnterTile(v, gp.new_tile, gp.x, gp.y), VETS_ENTERED_WORMHOLE)) { v->x_pos = gp.x; v->y_pos = gp.y; - VehiclePositionChanged(v); - if (!(v->vehstatus & VS_HIDDEN)) EndVehicleMove(v); + VehicleMove(v, !(v->vehstatus & VS_HIDDEN)); return; } } @@ -698,8 +695,7 @@ static void ShipController(Vehicle *v) getout: v->UpdateDeltaXY(dir); v->cur_image = v->GetImage(dir); - VehiclePositionChanged(v); - EndVehicleMove(v); + VehicleMove(v, true); return; reverse_direction: @@ -803,7 +799,7 @@ CommandCost CmdBuildShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 v->cargo_cap = GetVehicleProperty(v, 0x0D, svi->capacity); - VehiclePositionChanged(v); + VehicleMove(v, false); InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); InvalidateWindowClassesData(WC_SHIPS_LIST, 0); |