petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r8897) -Fix

Browse Source 
Change the signature of GetNewVehiclePos():
-void GetNewVehiclePos(const Vehicle *v, GetNewVehiclePosResult *gp);
+GetNewVehiclePosResult GetNewVehiclePos(const Vehicle *v);
This commit is contained in:
tron
2007-02-25 10:49:13 +00:00
parent 696b895b77
commit 1ce43c1a37
7 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/aircraft_cmd.cpp
View File

@@ -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 {