gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-07 14:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8750) -Fix (r8747): PLANES defined in wingdi.h caused compilation error under Win32. Changed to AIRPLANES

Browse Source
This commit is contained in:
KUDr 2007-02-15 22:00:04 +00:00
parent 6460d5b441
commit 72cdfb6352
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ai/default/default.cpp
View File

@ -3269,7 +3269,7 @@ static void AiStateAirportStuff(Player *p)
AirportFTAClass::Flags flags = GetAirport(st->airport_type)->flags; 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; continue;
} }
@ -3292,7 +3292,7 @@ static void AiStateAirportStuff(Player *p)
* broken because they will probably need different * broken because they will probably need different
* tileoff values etc), no matter that * tileoff values etc), no matter that
* IsHangarTile() makes no sense. --pasky */ * IsHangarTile() makes no sense. --pasky */
if (!(flags & AirportFTAClass::PLANES)) { if (!(flags & AirportFTAClass::AIRPLANES)) {
/* Heliports should have maybe own rulesets but /* Heliports should have maybe own rulesets but
* OTOH we don't want AI to pick them up when * OTOH we don't want AI to pick them up when
* looking for a suitable airport type to build. * looking for a suitable airport type to build.

4
src/aircraft_cmd.cpp
View File

@ -251,7 +251,7 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
// Prevent building aircraft types at places which can't handle them // Prevent building aircraft types at places which can't handle them
const Station* st = GetStationByTile(tile); const Station* st = GetStationByTile(tile);
const AirportFTAClass* apc = GetAirport(st->airport_type); 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; return CMD_ERROR;
} }
@ -1640,7 +1640,7 @@ static void AircraftEventHandler_Flying(Vehicle *v, const AirportFTAClass *apc)
st = GetStation(v->u.air.targetairport); st = GetStation(v->u.air.targetairport);
// runway busy or not allowed to use this airstation, circle // 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->airport_tile != 0 &&
(st->owner == OWNER_NONE || st->owner == v->owner)) { (st->owner == OWNER_NONE || st->owner == v->owner)) {
// {32,FLYING,NOTHING_block,37}, {32,LANDING,N,33}, {32,HELILANDING,N,41}, // {32,FLYING,NOTHING_block,37}, {32,LANDING,N,33}, {32,HELILANDING,N,41},

4
src/airport.h
View File

@ -122,9 +122,9 @@ struct AirportFTAbuildup;
typedef struct AirportFTAClass { typedef struct AirportFTAClass {
public: public:
enum Flags { enum Flags {
PLANES = 0x1, AIRPLANES = 0x1,
HELICOPTERS = 0x2, HELICOPTERS = 0x2,
ALL = PLANES | HELICOPTERS, ALL = AIRPLANES | HELICOPTERS,
SHORT_STRIP = 0x4 SHORT_STRIP = 0x4
}; };