From dd7c2b2f9db8b2ca2339d43fcf7b0f6da46e8c96 Mon Sep 17 00:00:00 2001 From: yexo Date: Mon, 22 Feb 2010 16:09:26 +0000 Subject: (svn r19205) -Codechange: move AirportSpec to newgrf_airport.h/cpp --- src/airport.cpp | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'src/airport.cpp') diff --git a/src/airport.cpp b/src/airport.cpp index 660b34ee8..14b860ec3 100644 --- a/src/airport.cpp +++ b/src/airport.cpp @@ -12,30 +12,15 @@ #include "stdafx.h" #include "debug.h" #include "airport.h" +#include "map_type.h" #include "table/airport_movement.h" #include "core/alloc_func.hpp" #include "date_func.h" #include "settings_type.h" +#include "newgrf_airport.h" #include "table/airporttile_ids.h" #include "table/airport_defaults.h" -AirportSpec AirportSpec::dummy = {NULL, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR}; -AirportSpec AirportSpec::oilrig = {NULL, NULL, 0, 1, 1, 0, 4, MIN_YEAR, MIN_YEAR}; - - -/** - * Retrieve airport spec for the given airport - * @param type index of airport - * @return A pointer to the corresponding AirportSpec - */ -/* static */ const AirportSpec *AirportSpec::Get(byte type) -{ - if (type == AT_OILRIG) return &oilrig; - assert(type < NUM_AIRPORTS); - extern const AirportSpec _origin_airport_specs[]; - return &_origin_airport_specs[type]; -} - /* Uncomment this to print out a full report of the airport-structure * You should either use * - true: full-report, print out every state and choice with string-names @@ -269,13 +254,6 @@ AirportFTAClass::~AirportFTAClass() free(layout); } -bool AirportSpec::IsAvailable() const -{ - if (_cur_year < this->min_year) return false; - if (_settings_game.station.never_expire_airports) return true; - return _cur_year <= this->max_year; -} - /** Get the number of elements of a source Airport state automata * Since it is actually just a big array of AirportFTA types, we only * know one element from the other by differing 'position' identifiers */ -- cgit v1.2.3-54-g00ecf