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 | b003536ea82e95f75a1ac9d6f557246e4bf4c9f4 (patch) | |
tree | fab12a7368299932db664475d5c9f6318d508de3 /src/aircraft_cmd.cpp | |
parent | 49d6804f97c4717be6c8ebd5d64a7548e2c05c96 (diff) | |
download | openttd-b003536ea82e95f75a1ac9d6f557246e4bf4c9f4.tar.xz |
(svn r15676) -Codechange: remove the need for BeginVehicleMove and merge VehiclePositionChanged and EndVehicleMove.
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r-- | src/aircraft_cmd.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 9f03f0d86..c9ffe5ff8 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -397,8 +397,8 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin UpdateAircraftCache(v); - VehiclePositionChanged(v); - VehiclePositionChanged(u); + VehicleMove(v, false); + VehicleMove(u, false); /* Aircraft with 3 vehicles (chopper)? */ if (v->subtype == AIR_HELICOPTER) { @@ -421,7 +421,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin w->UpdateDeltaXY(INVALID_DIR); u->SetNext(w); - VehiclePositionChanged(w); + VehicleMove(w, false); } InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile); @@ -692,9 +692,7 @@ static void HelicopterTickHandler(Vehicle *v) u->cur_image = img; - BeginVehicleMove(u); - VehiclePositionChanged(u); - EndVehicleMove(u); + VehicleMove(u, true); } void SetAircraftPosition(Vehicle *v, int x, int y, int z) @@ -706,9 +704,7 @@ void SetAircraftPosition(Vehicle *v, int x, int y, int z) v->cur_image = v->GetImage(v->direction); if (v->subtype == AIR_HELICOPTER) v->Next()->Next()->cur_image = GetRotorImage(v); - BeginVehicleMove(v); - VehiclePositionChanged(v); - EndVehicleMove(v); + VehicleMove(v, true); Vehicle *u = v->Next(); @@ -721,9 +717,7 @@ void SetAircraftPosition(Vehicle *v, int x, int y, int z) u->z_pos = GetSlopeZ(safe_x, safe_y); u->cur_image = v->cur_image; - BeginVehicleMove(u); - VehiclePositionChanged(u); - EndVehicleMove(u); + VehicleMove(u, true); u = u->Next(); if (u != NULL) { @@ -731,9 +725,7 @@ void SetAircraftPosition(Vehicle *v, int x, int y, int z) u->y_pos = y; u->z_pos = z + 5; - BeginVehicleMove(u); - VehiclePositionChanged(u); - EndVehicleMove(u); + VehicleMove(u, true); } } |