Mercurial > hg > openttd

changeset 6027:22d859b7458d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8750) -Fix (r8747): PLANES defined in wingdi.h caused compilation error under Win32. Changed to AIRPLANES
author KUDr <KUDr@openttd.org>
date Thu, 15 Feb 2007 22:00:04 +0000
parents fb6796cdcee4
children cdf5acda335e
files src/ai/default/default.cpp src/aircraft_cmd.cpp src/airport.h
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -3269,7 +3269,7 @@
 
 			AirportFTAClass::Flags flags = GetAirport(st->airport_type)->flags;
 
-			if (!(flags & (p->ai.build_kind == 1 && i == 0 ? AirportFTAClass::HELICOPTERS : AirportFTAClass::PLANES))) {
+			if (!(flags & (p->ai.build_kind == 1 && i == 0 ? AirportFTAClass::HELICOPTERS : AirportFTAClass::AIRPLANES))) {
 				continue;
 			}
 
@@ -3292,7 +3292,7 @@
 			 * broken because they will probably need different
 			 * tileoff values etc), no matter that
 			 * IsHangarTile() makes no sense. --pasky */
-			if (!(flags & AirportFTAClass::PLANES)) {
+			if (!(flags & AirportFTAClass::AIRPLANES)) {
 				/* Heliports should have maybe own rulesets but
 				 * OTOH we don't want AI to pick them up when
 				 * looking for a suitable airport type to build.
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -251,7 +251,7 @@
 	// Prevent building aircraft types at places which can't handle them
 	const Station* st = GetStationByTile(tile);
 	const AirportFTAClass* apc = GetAirport(st->airport_type);
-	if (!(apc->flags & (avi->subtype & AIR_CTOL ? AirportFTAClass::PLANES : AirportFTAClass::HELICOPTERS))) {
+	if (!(apc->flags & (avi->subtype & AIR_CTOL ? AirportFTAClass::AIRPLANES : AirportFTAClass::HELICOPTERS))) {
 		return CMD_ERROR;
 	}
 
@@ -1640,7 +1640,7 @@
 
 	st = GetStation(v->u.air.targetairport);
 	// runway busy or not allowed to use this airstation, circle
-	if (apc->flags & (v->subtype == AIR_HELICOPTER ? AirportFTAClass::HELICOPTERS : AirportFTAClass::PLANES) &&
+	if (apc->flags & (v->subtype == AIR_HELICOPTER ? AirportFTAClass::HELICOPTERS : AirportFTAClass::AIRPLANES) &&
 			st->airport_tile != 0 &&
 			(st->owner == OWNER_NONE || st->owner == v->owner)) {
 		// {32,FLYING,NOTHING_block,37}, {32,LANDING,N,33}, {32,HELILANDING,N,41},
--- a/src/airport.h
+++ b/src/airport.h
@@ -122,9 +122,9 @@
 typedef struct AirportFTAClass {
 	public:
 		enum Flags {
-			PLANES      = 0x1,
+			AIRPLANES   = 0x1,
 			HELICOPTERS = 0x2,
-			ALL         = PLANES | HELICOPTERS,
+			ALL         = AIRPLANES | HELICOPTERS,
 			SHORT_STRIP = 0x4
 		};