mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8834) -Fix 

Do not pass something to a function it better could figure out by itself
release/0.6
tron 2007-02-21 19:49:18 +00:00
parent f716c0b30f
commit b3d93e3aa2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/aircraft_cmd.cpp
View File

@ -38,7 +38,6 @@ static bool AirportSetBlocks(Vehicle *v, const AirportFTA *current_pos, const Ai
static bool AirportHasBlock(Vehicle *v, const AirportFTA *current_pos, const AirportFTAClass *apc); static bool AirportHasBlock(Vehicle *v, const AirportFTA *current_pos, const AirportFTAClass *apc);
static bool AirportFindFreeTerminal(Vehicle *v, const AirportFTAClass *apc); static bool AirportFindFreeTerminal(Vehicle *v, const AirportFTAClass *apc);
static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *apc); static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *apc);
static void AirportGoToNextPosition(Vehicle *v, const AirportFTAClass *apc);
static void CrashAirplane(Vehicle *v); static void CrashAirplane(Vehicle *v);
static void AircraftNextAirportPos_and_Order(Vehicle *v); static void AircraftNextAirportPos_and_Order(Vehicle *v);
@ -1738,11 +1737,13 @@ static void AirportClearBlock(const Vehicle *v, const AirportFTAClass *apc)
} }
} }
static void AirportGoToNextPosition(Vehicle *v, const AirportFTAClass *apc) static void AirportGoToNextPosition(Vehicle *v)
{ {
// if aircraft is not in position, wait until it is // if aircraft is not in position, wait until it is
if (!AircraftController(v)) return; if (!AircraftController(v)) return;
const AirportFTAClass *apc = GetStation(v->u.air.targetairport)->Airport();
AirportClearBlock(v, apc); AirportClearBlock(v, apc);
AirportMove(v, apc); // move aircraft to next position AirportMove(v, apc); // move aircraft to next position
} }
@ -2006,7 +2007,7 @@ static void AircraftEventHandler(Vehicle *v, int loop)
if (v->current_order.type >= OT_LOADING) return; if (v->current_order.type >= OT_LOADING) return;
AirportGoToNextPosition(v, GetStation(v->u.air.targetairport)->Airport()); AirportGoToNextPosition(v);
} }
void Aircraft_Tick(Vehicle *v) void Aircraft_Tick(Vehicle *v)