diff options
author | tron <tron@openttd.org> | 2007-02-25 10:49:13 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2007-02-25 10:49:13 +0000 |
commit | 1ce43c1a3754499902a2749f9db3c426595ab02f (patch) | |
tree | f18ec0cd5e3a04d73bbbf9ddae8c4ee638ee9fc4 /src/aircraft_cmd.cpp | |
parent | 696b895b776ce8a990260d1a6829a93e675aa6c7 (diff) | |
download | openttd-1ce43c1a3754499902a2749f9db3c426595ab02f.tar.xz |
(svn r8897) -Fix
Change the signature of GetNewVehiclePos():
-void GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp);
+GetNewVehiclePosResult GetNewVehiclePos(const Vehicle *v);
Diffstat (limited to 'src/aircraft_cmd.cpp')
-rw-r--r-- | src/aircraft_cmd.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 31455665e..2c56069e9 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1046,8 +1046,7 @@ static bool AircraftController(Vehicle *v) } /* Move vehicle. */ - GetNewVehiclePosResult gp; - GetNewVehiclePos(v, &gp); + GetNewVehiclePosResult gp = GetNewVehiclePos(v); v->tile = gp.new_tile; /* If vehicle is in the air, use tile coordinate 0. */ @@ -2072,8 +2071,7 @@ void UpdateOldAircraft(void) v_oldstyle->vehstatus &= ~VS_STOPPED; // make airplane moving v_oldstyle->u.air.state = FLYING; AircraftNextAirportPos_and_Order(v_oldstyle); // move it to the entry point of the airport - GetNewVehiclePosResult gp; - GetNewVehiclePos(v_oldstyle, &gp); // get the position of the plane (to be used for setting) + GetNewVehiclePosResult gp = GetNewVehiclePos(v_oldstyle); v_oldstyle->tile = 0; // aircraft in air is tile=0 /* correct speed of helicopter-rotors */ @@ -2101,8 +2099,7 @@ void UpdateAirplanesOnNewStation(const Station *st) v->u.air.state = FLYING; /* landing plane needs to be reset to flying height (only if in pause mode upgrade, * in normal mode, plane is reset in AircraftController. It doesn't hurt for FLYING */ - GetNewVehiclePosResult gp; - GetNewVehiclePos(v, &gp); + GetNewVehiclePosResult gp = GetNewVehiclePos(v); /* set new position x,y,z */ SetAircraftPosition(v, gp.x, gp.y, GetAircraftFlyingAltitude(v)); } else { |