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

(svn r8733) -Fix(r8705): Forgot to change some more places where airport blocks are stored

release/0.6
celestar 2007-02-14 12:00:43 +00:00
parent 59a814c6d3
commit 39b73119ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/aircraft_cmd.cpp
View File

@ -1838,7 +1838,7 @@ static bool AirportHasBlock(Vehicle *v, const AirportFTA *current_pos, const Air
// same block, then of course we can move // same block, then of course we can move
if (apc->layout[current_pos->position].block != next->block) { if (apc->layout[current_pos->position].block != next->block) {
const Station *st = GetStation(v->u.air.targetairport); const Station *st = GetStation(v->u.air.targetairport);
uint32 airport_flags = next->block; uint64 airport_flags = next->block;
// check additional possible extra blocks // check additional possible extra blocks
if (current_pos != reference && current_pos->block != NOTHING_block) { 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 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) { 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); Station* st = GetStation(v->u.air.targetairport);
//search for all all elements in the list with the same state, and blocks != N //search for all all elements in the list with the same state, and blocks != N
// this means more blocks should be checked/set // this means more blocks should be checked/set

2
src/airport.h
View File

@ -170,7 +170,7 @@ typedef struct AirportFTAClass {
// internal structure used in openttd - Finite sTate mAchine --> FTA // internal structure used in openttd - Finite sTate mAchine --> FTA
typedef struct AirportFTA { typedef struct AirportFTA {
struct AirportFTA *next; // possible extra movement choices from this position 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 position; // the position that an airplane is at
byte next_position; // next position from this position byte next_position; // next position from this position
byte heading; // heading (current orders), guiding an airplane to its target on an airport byte heading; // heading (current orders), guiding an airplane to its target on an airport