diff options
54 files changed, 58 insertions, 104 deletions
diff --git a/src/ai/api/ai_airport.cpp b/src/ai/api/ai_airport.cpp index 1a5ea04ee..469f90591 100644 --- a/src/ai/api/ai_airport.cpp +++ b/src/ai/api/ai_airport.cpp @@ -12,7 +12,7 @@ /* static */ bool AIAirport::IsValidAirportType(AirportType type) { - return type >= AT_SMALL && type <= AT_HELISTATION && HasBit(::GetValidAirports(), type); + return type >= 0 && type < NUM_AIRPORTS && ::GetAirport(type)->IsAvailable(); } /* static */ Money AIAirport::GetPrice(AirportType type) diff --git a/src/airport.cpp b/src/airport.cpp index e7aae33f5..a065d00d6 100644 --- a/src/airport.cpp +++ b/src/airport.cpp @@ -242,7 +242,8 @@ void InitializeAirports() 0, 0, 0, 0, 0, - 0 + 0, + MAX_YEAR + 1, MAX_YEAR + 1 ); CountryAirport = new AirportFTAClass( @@ -256,7 +257,8 @@ void InitializeAirports() lengthof(_airport_depots_country), 4, 3, 3, 0, - 4 + 4, + 0, 1959 ); CityAirport = new AirportFTAClass( @@ -270,7 +272,8 @@ void InitializeAirports() lengthof(_airport_depots_city), 6, 6, 5, 0, - 5 + 5, + 1955, MAX_YEAR ); MetropolitanAirport = new AirportFTAClass( @@ -284,7 +287,8 @@ void InitializeAirports() lengthof(_airport_depots_metropolitan), 6, 6, 8, 0, - 6 + 6, + 1980, MAX_YEAR ); InternationalAirport = new AirportFTAClass( @@ -298,7 +302,8 @@ void InitializeAirports() lengthof(_airport_depots_international), 7, 7, 17, 0, - 8 + 8, + 1990, MAX_YEAR ); IntercontinentalAirport = new AirportFTAClass( @@ -312,7 +317,8 @@ void InitializeAirports() lengthof(_airport_depots_intercontinental), 9, 11, 25, 0, - 10 + 10, + 2002, MAX_YEAR ); Heliport = new AirportFTAClass( @@ -326,7 +332,8 @@ void InitializeAirports() 0, 1, 1, 1, 60, - 4 + 4, + 1963, MAX_YEAR ); Oilrig = new AirportFTAClass( @@ -340,7 +347,8 @@ void InitializeAirports() 0, 1, 1, 0, 54, - 3 + 3, + MAX_YEAR + 1, MAX_YEAR + 1 ); CommuterAirport = new AirportFTAClass( @@ -354,7 +362,8 @@ void InitializeAirports() lengthof(_airport_depots_commuter), 5, 4, 4, 0, - 4 + 4, + 1983, MAX_YEAR ); HeliDepot = new AirportFTAClass( @@ -368,7 +377,8 @@ void InitializeAirports() lengthof(_airport_depots_helidepot), 2, 2, 2, 0, - 4 + 4, + 1976, MAX_YEAR ); HeliStation = new AirportFTAClass( @@ -382,7 +392,8 @@ void InitializeAirports() lengthof(_airport_depots_helistation), 4, 2, 3, 0, - 4 + 4, + 1980, MAX_YEAR ); } @@ -424,7 +435,9 @@ AirportFTAClass::AirportFTAClass( uint size_y_, byte noise_level_, byte delta_z_, - byte catchment_ + byte catchment_, + Year first_available_, + Year last_available_ ) : moving_data(moving_data_), terminals(terminals_), @@ -438,7 +451,9 @@ AirportFTAClass::AirportFTAClass( size_y(size_y_), noise_level(noise_level_), delta_z(delta_z_), - catchment(catchment_) + catchment(catchment_), + first_available(first_available_), + last_available(last_available_) { byte nofterminalgroups, nofhelipadgroups; @@ -485,7 +500,6 @@ AirportFTAClass::AirportFTAClass( #endif } - AirportFTAClass::~AirportFTAClass() { for (uint i = 0; i < nofelements; i++) { @@ -499,6 +513,13 @@ AirportFTAClass::~AirportFTAClass() free(layout); } +bool AirportFTAClass::IsAvailable() const +{ + if (_cur_year < this->first_available) return false; + if (_settings_game.station.never_expire_airports) return true; + return _cur_year <= this->last_available; +} + /** 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 */ @@ -668,20 +689,3 @@ const AirportFTAClass *GetAirport(const byte airport_type) case AT_DUMMY: return DummyAirport; } } - - -uint32 GetValidAirports() -{ - uint32 mask = 0; - - if (_cur_year < 1960 || _settings_game.station.always_small_airport) SetBit(mask, 0); // small airport - if (_cur_year >= 1955) SetBit(mask, 1); // city airport - if (_cur_year >= 1963) SetBit(mask, 2); // heliport - if (_cur_year >= 1980) SetBit(mask, 3); // metropolitan airport - if (_cur_year >= 1990) SetBit(mask, 4); // international airport - if (_cur_year >= 1983) SetBit(mask, 5); // commuter airport - if (_cur_year >= 1976) SetBit(mask, 6); // helidepot - if (_cur_year >= 2002) SetBit(mask, 7); // intercontinental airport - if (_cur_year >= 1980) SetBit(mask, 8); // helistation - return mask; -} diff --git a/src/airport.h b/src/airport.h index e459187f8..0f1b49180 100644 --- a/src/airport.h +++ b/src/airport.h @@ -8,6 +8,7 @@ #include "direction_type.h" #include "map_type.h" #include "tile_type.h" +#include "date_type.h" /** Current limits for airports */ enum { @@ -151,7 +152,9 @@ struct AirportFTAClass { uint size_y, uint8 noise_level, byte delta_z, - byte catchment + byte catchment, + Year first_available, + Year last_available ); ~AirportFTAClass(); @@ -162,6 +165,9 @@ struct AirportFTAClass { return &moving_data[position]; } + /** Is this airport available at this date? */ + bool IsAvailable() const; + const AirportMovingData *moving_data; struct AirportFTA *layout; ///< state machine for airport const byte *terminals; @@ -176,6 +182,8 @@ struct AirportFTAClass { uint8 noise_level; ///< noise that this airport generates byte delta_z; ///< Z adjustment for helicopter pads byte catchment; + Year first_available; ///< the year this airport becomes available + Year last_available; ///< the year this airport expires }; DECLARE_ENUM_AS_BIT_SET(AirportFTAClass::Flags) @@ -194,13 +202,6 @@ void InitializeAirports(); void UnInitializeAirports(); const AirportFTAClass *GetAirport(const byte airport_type); -/** Get buildable airport bitmask. - * @return get all buildable airports at this given time, bitmasked. - * Bit 0 means the small airport is buildable, etc. - * @todo set availability of airports by year, instead of airplane - */ -uint32 GetValidAirports(); - extern const byte * const _airport_sections[]; #endif /* AIRPORT_H */ diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index 539ade2ff..fa1389202 100644 --- a/src/airport_gui.cpp +++ b/src/airport_gui.cpp @@ -224,23 +224,14 @@ public: { int i; // airport enabling loop uint16 y_noise_offset = 0; - uint32 avail_airports; const AirportFTAClass *airport; - avail_airports = GetValidAirports(); - this->RaiseWidget(_selected_airport_type + BAW_SMALL_AIRPORT); - if (!HasBit(avail_airports, 0) && _selected_airport_type == AT_SMALL) _selected_airport_type = AT_LARGE; - if (!HasBit(avail_airports, 1) && _selected_airport_type == AT_LARGE) _selected_airport_type = AT_SMALL; + if (!GetAirport(AT_SMALL)->IsAvailable() && _selected_airport_type == AT_SMALL) _selected_airport_type = AT_LARGE; + if (!GetAirport(AT_LARGE)->IsAvailable() && _selected_airport_type == AT_LARGE) _selected_airport_type = AT_SMALL; this->LowerWidget(_selected_airport_type + BAW_SMALL_AIRPORT); - /* 'Country Airport' starts at widget BAW_SMALL_AIRPORT, and if its bit is set, it is - * available, so take its opposite value to set the disabled state. - * There are 9 buildable airports - * XXX TODO : all airports should be held in arrays, with all relevant data. - * This should be part of newgrf-airports, i suppose - */ - for (i = 0; i < BAW_AIRPORT_COUNT; i++) this->SetWidgetDisabledState(i + BAW_SMALL_AIRPORT, !HasBit(avail_airports, i)); + for (i = 0; i < BAW_AIRPORT_COUNT; i++) this->SetWidgetDisabledState(i + BAW_SMALL_AIRPORT, !GetAirport(i)->IsAvailable()); /* select default the coverage area to 'Off' (16) */ airport = GetAirport(_selected_airport_type); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index d31c2f71a..282805f43 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -945,7 +945,6 @@ STR_CONFIG_SETTING_PLANE_SPEED :{LTBLUE}Vliegtu STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Laattoe skyf-deur pad stop op dorp besit paaie: {ORANGE}{STRING} STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Laattoe gebou van aangrensend stasies: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Altyd laattoe klein lughawenst: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Waarsku as trein verloor is: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Bespreek voertuig se opdrae: {ORANGE}{STRING} diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 508cd1b86..4b50f1c49 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}الس STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}السماح بتعدد محركات NewGFR {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE} تغير هذا الخيار غير متاح عندما يكون هناك عربات -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}السمح دائما بالمطارات الصغيرة: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}عرض تحذير عندما يضيع قطار: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}استعراض اوامر العربات: {ORANGE}{STRING} diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index b2b8b6c9d..46f227dec 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -964,7 +964,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permiti STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Ativar múltiplos conjuntos NewGRF de locomotivas: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Impossível alterar essa configuração enquanto houverem veículos. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avisar se o trem está perdido: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index 01fdf7cd9..5677ffb72 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -955,7 +955,6 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Пре STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Позвалявай допрени гари: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Няколко NewGRF алгоритъма едновременно: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Винаги могат да се строят малки летища: {ORANGE}{STRING.n} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Предупреждение при загубен влак: {ORANGE}{STRING.n} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Преглед на заповеди: {ORANGE}{STRING} diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index c0d0b86f0..db43227ba 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permet STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Activa diversos paquets de motors NewGRF: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}No es pot canviar aquest ajustament quan hi ha vehicles. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Permet sempre aeroports petits: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avisa si un tren es perd: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Revisa ordres dels vehicles: {ORANGE}{STRING} diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index a53627611..628238c42 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1020,7 +1020,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Dopusti STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Omogući više NewGRF setova strojeva: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Mjenjanje ovih postavki nije moguće kad postoje vozila -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Uvijek dopusti male zračne luke: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Upozori ako se vlak izgubio: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Pregledaj naredbe vozila: {ORANGE}{STRING} diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 52be1823d..3377a8387 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1031,7 +1031,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Povolit STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Více grafických setů s vozidly vedle sebe: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Toto nastavení nemůže být změněno, když jsou ve hře již nějaká vozidla. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Malá letiště se budou moci stále stavět: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Varovat, pokud vlak nenajde cestu: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Kontrolovat příkazy vozidel: {ORANGE}{STRING} diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 3eab8e376..bcd243c70 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -961,7 +961,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Tillad STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Muliggør flere NewGRF køretøjssæt: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Denne indstilling kan ikke ændres, når der er køretøjer. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Tillad altid små lufthavne: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Advar hvis tog er faret vild: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Kontroller køretøjers ordreliste: {ORANGE}{STRING} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index d040e698b..519f068d7 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Bouwen STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Activeer meerdere NewGRF treinsets: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Deze instelling kan niet gewijzigd worden als er voertuigen zijn. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Altijd kleine vliegvelden toestaan: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Waarschuwen als trein verdwaald is: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Herzie voertuigorders: {ORANGE}{STRING} diff --git a/src/lang/english.txt b/src/lang/english.txt index 238b875f1..863ddffc1 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -963,7 +963,7 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Allow b STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Enable multiple NewGRF engine sets: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Changing this setting is not possible when there are vehicles. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Always allow small airports: {ORANGE}{STRING1} +STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Airports never expire: {ORANGE}{STRING1} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Warn if train is lost: {ORANGE}{STRING1} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING1} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 80da2bf4c..7c9ed315c 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Allow b STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Enable multiple NewGRF engine sets: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Changing this setting is not possible when there are vehicles. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Always allow small airports: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Warn if train is lost: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Review vehicles' orders: {ORANGE}{STRING} diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index f7d67e818..da4b59699 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -898,7 +898,6 @@ STR_CONFIG_SETTING_FREIGHT_TRAINS :{LTBLUE}Pezplii STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Permesu trairaj bushaltejoj sur vojoj urboposedataj: {ORANGE}{STRING} STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permesu konstrui staciojn apude: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Ĉiam permesu malgrandajn flughavenojn: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avertu se trajno perdiĝas: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Atentu veturilajn ordenojn: {ORANGE}{STRING} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index 3595d7eea..98df96d5c 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1020,7 +1020,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Jaamade STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Mitme NewGRF sõidukikomplekti lubamine: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Sõidukite olemasolul ei saa seda seadet muuta. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Väikesed lennuväljad mängu lõpuni: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Hoiatamine rongide eksimisel: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Sõidukite sihtpunktide ülevaade: {ORANGE}{STRING} diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index f054ae4d0..0e629514b 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Vierekk STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Useat NewGRF-veturisetit: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Tätä asetusta ei voi muuttaa kun kulkuneuvoja on olemassa. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Salli aina pienet lentokentät: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Varoita jos juna menetetään: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Tarkista ajoneuvojen pysähdykset: {ORANGE}{STRING} diff --git a/src/lang/french.txt b/src/lang/french.txt index 50c84e7bb..3a92edaed 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -964,7 +964,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Autoris STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Utiliser plusieurs NewGRF de véhicules: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Il n'est pas possible de modifier ce paramètre quand il y'a des véhicules. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Toujours permettre les petits aéroports: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avertir si le train est perdu: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Vérification des ordres des véhicules : {ORANGE}{STRING} diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 8a6a62f73..9d19c65c2 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -928,7 +928,6 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Permiti STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permiti-la construcción de estacións contiguas: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Activar motor para múltiples NewGRF: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avisar se un tren se perde: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Revisa-las ordes do vehículo: {ORANGE}{STRING} diff --git a/src/lang/german.txt b/src/lang/german.txt index 45da68fc9..f91c451ea 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -964,7 +964,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Bau ang STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Mehrere NewGRF Fahrzeugsets erlauben: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Diese Einstellung kann nicht geändert werden solange Fahrzeuge im Spiel sind. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Kleine Flughäfen immer erlauben: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Warnen, wenn sich ein Zug verirrt hat: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Fahrpläne prüfen: {ORANGE}{STRING} diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 1cd65bac9..585f36cf5 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -948,7 +948,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{ORANGE}{STRING STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Enable multiple NewGRF engine sets: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}החלפת הגדרה זו לא אפשרית כאשר יש רכבים -STR_CONFIG_SETTING_SMALL_AIRPORTS :{ORANGE}{STRING}{LTBLUE} :אפשר בניית שדות תעופה קטנים בכל עת STR_CONFIG_SETTING_WARN_LOST_TRAIN :{ORANGE}{STRING}{LTBLUE} :התרע על רכבות אבודות STR_CONFIG_SETTING_ORDER_REVIEW :{ORANGE}{STRING}{LTBLUE} :בדוק מסלולי נסיעה diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index d3b553bc7..6c1dab555 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -997,7 +997,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Érintk STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Több NewGRF járműgarnitúra engedélyezése: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}A beállítást nem lehet megváltoztatni, ha van használatban jármű. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Mindig engedélyezze a kis repülőtereket: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Figyelmeztet ha a vonat eltévedt: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Menetrend-ellenőrzés: {ORANGE}{STRING} diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 11d73bfee..3ce492bca 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -964,7 +964,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Heimila STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Virkja mörg NewGRF vélasöfn: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Ekki er hægt að breyta þessari stillingu þegar til eru farartæki. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Alltaf leyfa litla flugvelli: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Gera viðvart ef lest týnist: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Fara yfir áætlanir farartækja: {ORANGE}{STRING} diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 9b1bdb795..834384a37 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Ijinkan STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Aktifkan beberapa pengaturan mesin NewGRF : {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Tidak diijinkan mengubah setting ini karena kendaraan sudah ada -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Selalu ijinkan membangun bandara kecil: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Ingatkan jika kereta tersesat: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Tinjau perintah kendaraan: {ORANGE}{STRING} diff --git a/src/lang/italian.txt b/src/lang/italian.txt index d8ab52ade..b5810ce0a 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -965,7 +965,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Consent STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Abilita pacchetti di locomotive NewGRF multipli: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Non è possibile modificare questa impostazione quando esistono veicoli. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Consenti sempre la costruzione di piccoli aeroporti: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avvisa se un treno si è perso: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Controlla gli ordini dei veicoli: {ORANGE}{STRING} diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 449e15d1a..5ae331102 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -947,7 +947,6 @@ STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :{LTBLUE}他社 STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}隣接した駅の建設を許容：{ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}複数の NewGRF エンジンセットを有効にする: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}常に小型空港の建設を許容：{ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}列車が行方不明となった場合は通告：{ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}列車の指令をレビュー：{ORANGE}{STRING} diff --git a/src/lang/korean.txt b/src/lang/korean.txt index b33cf2017..94d410cf4 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -962,7 +962,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}정거 STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}여러 개의 NewGRF 엔진 세트를 허용: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}이미 차량이 존재하면 이 설정을 변경하실 수 없습니다. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}소형 공항의 건설을 허용 : {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}열차가 길을 잃으면 경고 : {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}차량의 경로 검사 : {ORANGE}{STRING} diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index ca96c168b..1d4aab9a8 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -955,7 +955,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Atļaut STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Iespējot vairākus NewGRF transporta līdzekļu komplektus: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Šo parametru nav iespējams izmainīt, kad tur ir transportlīdzekļi. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Vienmēr atļaut mazas lidostas: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Brīdināt, ja vilciens apmaldās: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Pārskatīt transportu rīkojumus: {ORANGE}{STRING} diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index 85c03d89f..74b09907f 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -987,7 +987,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Leisti STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Leisti kelis NewGRF transporto pr. rinkinius vienu metu: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Neįmanoma pakeisti nuostatos kai yra tr. priemonių. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Visada leisti statyti mažus oro uostus: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Perspėti apie traukinio praradimą: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Peržiūrėti tr. pr. užduotis: {ORANGE}{STRING} diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index efe92769b..06122cd49 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Erlaabt STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}E puer NewGRF-Päk aktivéiren: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Déi Astellung kann net geännert gin wann do Gefierer sin. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Erlaab ëmmer kleng Fluchhäfen: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Warnen wann en Zuch verluer geet: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Opträg vun den Gefierer nopréifen: {ORANGE}{STRING} diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 6f290992c..2c9264d87 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -948,7 +948,6 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Tillat STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Tillat bygging av nærliggende stasjoner: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Sett i gang flere ny grafikk kjerne sets: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Alltid tillat bygging av små flyplasser: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Vis en advarsel hvis et tog har kjørt seg vill{ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Inspiser kjøretøyenes ordrer: {ORANGE}{STRING} diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index c7a426fa7..1c7777e27 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -955,7 +955,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Tillat STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Slå på fleire sett NewGRF grafikkmotorar: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Endring av denne intstillinga er ikkje mogleg når det finst bilar. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Alltid tillat bygging av små flyplassar: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Vis ei åtvaring dersom eit tog har køyrt seg vill: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Inspiser ordrane til køyretøya: {ORANGE}{STRING} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 55c10fa5e..920e5eef1 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1338,7 +1338,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Pozwól STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Zezwól na wiele zestawów NewGRF: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Zmiana tego ustawienia nie jest możliwa, gdy znajdują się tutaj pojazdy. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Zawsze zezwalaj budować małe lotniska: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Ostrzegaj jeśli pociąg się zgubi: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Kontroluj polecenia pojazdów: {ORANGE}{STRING} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index e26e739a2..f089d9dd0 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -954,7 +954,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permiti STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Utilizar múltiplos conjuntos NewGRF de veículos: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Não é possivel mudar quando se encontram veículos. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Alertar em caso de perda do comboio: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 4e6ad9ce3..a0326e828 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permite STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Permite mai multe seturi NewGRF simultan: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Schimbarea acestei setări nu este permisă cand există vehicule in joc. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Permite întotdeauna aeroporturi mici: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avertizeaza daca trenul este pierdut: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Verificarea ordinelor vehiculelor: {ORANGE}{STRING} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 4bd4a535a..4fa1ba4b8 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1096,7 +1096,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Раз STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Включить поддержку нескольких наборов NewGRF с транспортом: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Изменение этого параметра невозможно, если в игре есть транспортные средства. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Малые аэропорты всегда доступны: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Предупреждать, если поезд заблудился: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Проверять маршруты на правильность: {ORANGE}{STRING} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 3efb35c4e..d42bf926f 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1120,7 +1120,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Dozvolj STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Dozvoljeno više NewGRF kolekcija mišina: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Promena ovog podešavanja nije moguća dok postoje vozila. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Uvek dostupni mali aerodromi: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Upozorenje ako se voz izgubi: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Provera naredbi vozila: {ORANGE}{STRING} diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 8137179e6..8f68cf465 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}允许 STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}允许使用多GRF运输工具： {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}当有车辆时，不可能更改此设定。 -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}总允许建设小型机场：{ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}当列车迷路时发出警告：{ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}检查车辆的调度计划：{ORANGE}{STRING} diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index f85577b36..46a663cb7 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1021,7 +1021,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Povolit STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Povolit viaceré NewGRF sety s rušnami: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Zmena tohto nastavenia nie je možná, pokial sa tu nachádzajú vozidlá. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Vždy povolit stavbu malých letísk: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Upozornit ak vlak nedokáže nájst cestu: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Obnovenie prikazov vozidla: {ORANGE}{STRING} diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index fa94bed1d..7820bef07 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1005,7 +1005,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Dovoli STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Omogoči večkratni set NewGRF pogona: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Sprememba teh nastavitev ni mogoča, ko so tam vozila. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Vedno dovoli majhna letališča: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Opozori, če se vlak izgubi: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Pregled ukazov vozila: {ORANGE}{STRING} diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index f051d0194..64254b999 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -964,7 +964,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Permiti STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Activar motor de multiples NewGRF: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Este cambio no es posible cuando tiene vehículos -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Permitir siempre aeropuertos pequeños: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Avisar si el tren se pierde: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Revisar ordenes de los vehículos: {ORANGE}{STRING} diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index a492da015..a71586802 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Tillåt STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Tillåt flera NewGRF-set: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Det är inte möjligt att ändra denna inställning när det finns fordon -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Tillåt alltid små flygplatser: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Varna om tåg åker vilse: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Granska fordonens destinationer: {ORANGE}{STRING} diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 20c07dcda..a6a9513aa 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -950,7 +950,6 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}可在 STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}允許按 Ctrl 鍵興建相鄰車站： {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}允許載入多個 NewGRF 車輛組：{ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}永遠可以興建小機場：{ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}列車迷路時警告：{ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}檢查交通工具指令：{ORANGE}{STRING} diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 334b60767..111b965e3 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -963,7 +963,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Bitişi STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Birden çok NewGRF lokomotif setini aktifleştir: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Araçlar varken bu ayarı değiştirmezsiniz. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Küçük havalimanı her zaman etkin: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Tren kaybolunca uyar: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Arac talimatlarını önizle: {ORANGE}{STRING} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index df7183e2f..e9ce338a4 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1079,7 +1079,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Доз STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Дозволити декілька NewGRF наборів транспорту: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Цю настройку не можна змінювати, якщо є транспорт. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Будувати малі аеропорти можна завжди: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Повідомляти, якщо поїзд загубився {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Показ транспортних наказів: {ORANGE}{STRING} diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt index 294b9948a..64bee5786 100644 --- a/src/lang/unfinished/greek.txt +++ b/src/lang/unfinished/greek.txt @@ -951,7 +951,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Επι STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Επιτρέπεται η χρήση πολλαπλών μηχανών από τα NewGRF: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Δεν είναι δυνατή η αλλαγή αυτής της ρύθμισης όταν υπάρχουν οχήματα. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Επιτρέπονται τα μικρά αεροδρόμια πάντα: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Προειδοποίηση αν χαθεί τρένο: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Επανεξέταση οδηγιών τρένων: {ORANGE}{STRING} diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt index 6759a24ce..8334f51c3 100644 --- a/src/lang/unfinished/malay.txt +++ b/src/lang/unfinished/malay.txt @@ -765,7 +765,6 @@ STR_CONFIG_SETTING_LONGBRIDGES :{LTBLUE}Membena STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :seperti industri lain STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Membolehkan berbilang set enjin NewGRF: {ORANGE}{STRING} -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Selalu membenarkan lapangan terbang yang kecil: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Memperingatkan jika satu kereta api hilang jalan: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW_OFF :tidak diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 8fb74d24e..3cf4ec675 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -961,7 +961,6 @@ STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Caniat STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Galluogi defnyddio mwy nag un o setiau injian NewGRF: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Nid yw hi'n bosib newid y gosodiadau pan mae cerbydau'n bodoli. -STR_CONFIG_SETTING_SMALL_AIRPORTS :{LTBLUE}Caniatáu meysydd awyr bach drwy gydol y gêm: {ORANGE}{STRING} STR_CONFIG_SETTING_WARN_LOST_TRAIN :{LTBLUE}Rhybuddio os yw'r trên ar goll: {ORANGE}{STRING} STR_CONFIG_SETTING_ORDER_REVIEW :{LTBLUE}Adolygu gorchmynion y cerbyd: {ORANGE}{STRING} diff --git a/src/newgrf.cpp b/src/newgrf.cpp index da7de1e07..be9e335b8 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -5294,7 +5294,7 @@ static void GRFUnsafe(byte *buf, size_t len) static void InitializeGRFSpecial() { - _ttdpatch_flags[0] = ((_settings_game.station.always_small_airport ? 1 : 0) << 0x0C) // keepsmallairport + _ttdpatch_flags[0] = ((_settings_game.station.never_expire_airports ? 1 : 0) << 0x0C) // keepsmallairport | (1 << 0x0D) // newairports | (1 << 0x0E) // largestations | ((_settings_game.construction.longbridges ? 1 : 0) << 0x0F) // longbridges diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index d32685566..b276eaf13 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1202,7 +1202,7 @@ static SettingEntry _settings_construction[] = { SettingEntry("construction.autoslope"), SettingEntry("construction.extra_dynamite"), SettingEntry("construction.longbridges"), - SettingEntry("station.always_small_airport"), + SettingEntry("station.never_expire_airports"), SettingEntry("construction.freeform_edges"), }; /** Construction sub-page */ diff --git a/src/settings_type.h b/src/settings_type.h index 88df6945d..2a0274a8f 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -329,7 +329,7 @@ struct StationSettings { bool nonuniform_stations; ///< allow nonuniform train stations bool adjacent_stations; ///< allow stations to be built directly adjacent to other stations bool distant_join_stations; ///< allow to join non-adjacent stations - bool always_small_airport; ///< always allow small airports + bool never_expire_airports; ///< never expire airports byte station_spread; ///< amount a station may spread }; diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 2c86a3fa5..c559ff31e 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1718,15 +1718,17 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint if (distant_join && (!_settings_game.station.distant_join_stations || !Station::IsValidID(station_to_join))) return CMD_ERROR; - /* Check if a valid, buildable airport was chosen for construction */ - if (p1 >= NUM_AIRPORTS || !HasBit(GetValidAirports(), p1)) return CMD_ERROR; + if (p1 >= NUM_AIRPORTS) return CMD_ERROR; if (!CheckIfAuthorityAllowsNewStation(tile, flags)) { return CMD_ERROR; } - Town *t = ClosestTownFromTile(tile, UINT_MAX); + /* Check if a valid, buildable airport was chosen for construction */ const AirportFTAClass *afc = GetAirport(p1); + if (!afc->IsAvailable()) return CMD_ERROR; + + Town *t = ClosestTownFromTile(tile, UINT_MAX); int w = afc->size_x; int h = afc->size_y; Station *st = NULL; diff --git a/src/table/settings.h b/src/table/settings.h index d208d7646..a8bafd943 100644 --- a/src/table/settings.h +++ b/src/table/settings.h @@ -353,7 +353,7 @@ const SettingDesc _settings[] = { SDT_BOOL(GameSettings, construction.extra_dynamite, 0, 0, false, STR_CONFIG_SETTING_EXTRADYNAMITE, NULL), SDT_BOOL(GameSettings, construction.longbridges, 0,NN, true, STR_CONFIG_SETTING_LONGBRIDGES, NULL), SDT_BOOL(GameSettings, construction.signal_side, N,NN, true, STR_CONFIG_SETTING_SIGNALSIDE, RedrawScreen), - SDT_BOOL(GameSettings, station.always_small_airport, 0,NN, false, STR_CONFIG_SETTING_SMALL_AIRPORTS, NULL), + SDT_BOOL(GameSettings, station.never_expire_airports, 0,NN, false, STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS, NULL), SDT_CONDVAR(GameSettings, economy.town_layout, SLE_UINT8, 59, SL_MAX_VERSION, 0,MS,TL_ORIGINAL,TL_BEGIN,NUM_TLS-1,1, STR_CONFIG_SETTING_TOWN_LAYOUT, NULL), SDT_CONDBOOL(GameSettings, economy.allow_town_roads, 113, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_ALLOW_TOWN_ROADS, NULL), |