summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2007-02-14 12:00:43 +0000
committercelestar <celestar@openttd.org>2007-02-14 12:00:43 +0000
commitca310e5a2684e8a3f905ba59219fc5c24c089f78 (patch)
tree18be145537f2035cff4e0cf2f83ce25badf167ff
parentbde06e75b42c469247ee3afbd8078713402707de (diff)
downloadopenttd-ca310e5a2684e8a3f905ba59219fc5c24c089f78.tar.xz
(svn r8733) -Fix(r8705): Forgot to change some more places where airport blocks are stored
-rw-r--r--src/aircraft_cmd.cpp4
-rw-r--r--src/airport.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 7ff79b500..a41ac1326 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 ab1b11075..f0be29815 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