From 39b73119cabcaa793856b441461fd77e37c491ef Mon Sep 17 00:00:00 2001 From: celestar Date: Wed, 14 Feb 2007 12:00:43 +0000 Subject: [PATCH] (svn r8733) -Fix(r8705): Forgot to change some more places where airport blocks are stored --- src/aircraft_cmd.cpp | 4 ++-- src/airport.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 7ff79b5002..a41ac13263 100644 --- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1838,7 +1838,7 @@ static bool AirportHasBlock(Vehicle *v, const AirportFTA *current_pos, const Air // same block, then of course we can move if (apc->layout[current_pos->position].block != next->block) { const Station *st = GetStation(v->u.air.targetairport); - uint32 airport_flags = next->block; + uint64 airport_flags = next->block; // check additional possible extra blocks if (current_pos != reference && current_pos->block != NOTHING_block) { @@ -1862,7 +1862,7 @@ static bool AirportSetBlocks(Vehicle *v, AirportFTA *current_pos, const AirportF // if the next position is in another block, check it and wait until it is free if ((apc->layout[current_pos->position].block & next->block) != next->block) { - uint32 airport_flags = next->block; + uint64 airport_flags = next->block; Station* st = GetStation(v->u.air.targetairport); //search for all all elements in the list with the same state, and blocks != N // this means more blocks should be checked/set diff --git a/src/airport.h b/src/airport.h index ab1b110751..f0be298159 100644 --- a/src/airport.h +++ b/src/airport.h @@ -170,7 +170,7 @@ typedef struct AirportFTAClass { // internal structure used in openttd - Finite sTate mAchine --> FTA typedef struct AirportFTA { struct AirportFTA *next; // possible extra movement choices from this position - uint32 block; // 32 bit blocks (st->airport_flags), should be enough for the most complex airports + uint64 block; // 64 bit blocks (st->airport_flags), should be enough for the most complex airports byte position; // the position that an airplane is at byte next_position; // next position from this position byte heading; // heading (current orders), guiding an airplane to its target on an airport