diff options
author | rubidium <rubidium@openttd.org> | 2014-09-20 15:31:26 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2014-09-20 15:31:26 +0000 |
commit | 6c2abf0930c23e7da82a892fb37c97786c245c00 (patch) | |
tree | 13db191cf49b57df14fdbf2c71ce558bbda57f6a /src/aircraft_cmd.cpp | |
parent | c4311903b71345a9c5ad0e5271ed722d71994c9e (diff) | |
download | openttd-6c2abf0930c23e7da82a892fb37c97786c245c00.tar.xz |
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r-- | src/aircraft_cmd.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 2f49158eb..24a3127e0 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -337,8 +337,8 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine * UpdateAircraftCache(v, true); - VehicleUpdatePosition(v); - VehicleUpdatePosition(u); + v->UpdatePosition(); + u->UpdatePosition(); /* Aircraft with 3 vehicles (chopper)? */ if (v->subtype == AIR_HELICOPTER) { @@ -359,7 +359,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, const Engine * w->UpdateDeltaXY(INVALID_DIR); u->SetNext(w); - VehicleUpdatePosition(w); + w->UpdatePosition(); } } @@ -487,7 +487,7 @@ static void HelicopterTickHandler(Aircraft *v) u->cur_image = img; - VehicleUpdatePositionAndViewport(u); + u->UpdatePositionAndViewport(); } /** @@ -503,7 +503,7 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z) v->y_pos = y; v->z_pos = z; - VehicleUpdatePosition(v); + v->UpdatePosition(); v->UpdateViewport(true, false); if (v->subtype == AIR_HELICOPTER) v->Next()->Next()->cur_image = GetRotorImage(v, EIT_ON_MAP); @@ -518,7 +518,7 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z) u->z_pos = GetSlopePixelZ(safe_x, safe_y); u->cur_image = v->cur_image; - VehicleUpdatePositionAndViewport(u); + u->UpdatePositionAndViewport(); u = u->Next(); if (u != NULL) { @@ -526,7 +526,7 @@ void SetAircraftPosition(Aircraft *v, int x, int y, int z) u->y_pos = y; u->z_pos = z + ROTOR_Z_OFFSET; - VehicleUpdatePositionAndViewport(u); + u->UpdatePositionAndViewport(); } } |