petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r19455) -Codechange: split all airport information in Station to a seperate class

Browse Source
This commit is contained in:
yexo
2010-03-18 21:02:20 +00:00
parent 0eb5709c86
commit c4a88ce022
23 changed files with 100 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vehicle.cpp
View File

@@ -626,8 +626,8 @@ void Vehicle::PreDestructor()
Aircraft *a = Aircraft::From(this);
Station *st = GetTargetAirportIfValid(a);
if (st != NULL) {
const AirportFTA *layout = st->Airport()->layout;
CLRBITS(st->airport_flags, layout[a->previous_pos].block | layout[a->pos].block);
const AirportFTA *layout = st->airport.GetFTA()->layout;
CLRBITS(st->airport.flags, layout[a->previous_pos].block | layout[a->pos].block);
}
}
@@ -1874,7 +1874,7 @@ bool CanVehicleUseStation(EngineID engine_type, const Station *st)
case VEH_AIRCRAFT:
return (st->facilities & FACIL_AIRPORT) != 0 &&
(st->Airport()->flags & (e->u.air.subtype & AIR_CTOL ? AirportFTAClass::AIRPLANES : AirportFTAClass::HELICOPTERS)) != 0;
(st->airport.GetFTA()->flags & (e->u.air.subtype & AIR_CTOL ? AirportFTAClass::AIRPLANES : AirportFTAClass::HELICOPTERS)) != 0;
default:
return false;