cpp/openttd-patchpack/source Changeset - r6011:0c796a4db1e8

Changeset - r6011:0c796a4db1e8

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

celestar - 17 years ago 2007-02-14 12:00:43
celestar@openttd.org

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

2 files changed with 3 insertions and 3 deletions:

src/aircraft_cmd.cpp

src/airport.h

0 comments (0 inline, 0 general)

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -1838,7 +1838,7 @@ static bool AirportHasBlock(Vehicle *v, @@
 	// 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, @@
 	// 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

src/airport.h

➞

Show inline comments

@@ @@ -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

0 comments (0 inline, 0 general)