Mercurial > hg > openttd
changeset 6011:21d301b3bd81 draft
(svn r8733) -Fix(r8705): Forgot to change some more places where airport blocks are stored
| author | celestar <celestar@openttd.org> |
|---|---|
| date | Wed, 14 Feb 2007 12:00:43 +0000 |
| parents | 500621d53557 |
| children | 542153c1c803 |
| files | src/aircraft_cmd.cpp src/airport.h |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -1838,7 +1838,7 @@ // 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 @@ // 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
--- a/src/airport.h +++ b/src/airport.h @@ -170,7 +170,7 @@ // 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