Add: *Add two more experimental airtypes for graphic purposes.

media/baseset/openttd.grf.hash

@@ -1 +1 @@
-43b4094f645929e9d143a93983906d81
+8bf3527c85bb373fa65b8e1d6b68f388

media/baseset/openttd/CMakeLists.txt

@@ -28,6 +28,8 @@ if(GRFCODEC_FOUND)
                          ${CMAKE_CURRENT_SOURCE_DIR}/2ccmap.nfo
         PNG_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/airports.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/airport_asphalt.png
+                         ${CMAKE_CURRENT_SOURCE_DIR}/airport_asphalt_dark.png
+                         ${CMAKE_CURRENT_SOURCE_DIR}/airport_asphalt_yellow.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/airport_gravel.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/airport_preview.png
                          ${CMAKE_CURRENT_SOURCE_DIR}/airport_water.png

src/air_type.h

@@ -17,13 +17,18 @@ typedef uint32_t AirTypeLabel;
 static const AirTypeLabel AIRTYPE_LABEL_GRAVEL  = 'GRVL';
 static const AirTypeLabel AIRTYPE_LABEL_ASPHALT = 'ASPH';
 static const AirTypeLabel AIRTYPE_LABEL_WATER   = 'WATR';
+static const AirTypeLabel AIRTYPE_LABEL_ASPHALT_DARK   = 'ASPD';
+static const AirTypeLabel AIRTYPE_LABEL_ASPHALT_YELLOW = 'ASPY';
+
 
 /** Enumeration for all possible airtypes. */
 enum AirType : uint8_t {
 	AIRTYPE_BEGIN    = 0,    ///< Used for iterations
 	AIRTYPE_GRAVEL   = 0,    ///< Gravel surface
 	AIRTYPE_ASPHALT  = 1,    ///< Asphalt surface
 	AIRTYPE_WATER    = 2,    ///< Water surface
+	AIRTYPE_DARK     = 3,
+	AIRTYPE_YELLOW   = 4,
 	AIRTYPE_END      = 16,   ///< Used for iterations
 	INVALID_AIRTYPE  = 0xFF, ///< Flag for invalid airtype
 
@@ -41,7 +46,9 @@ enum AirTypes : uint64_t {
 	AIRTYPES_GRAVEL   = 1 << AIRTYPE_GRAVEL,    ///< Gravel surface
 	AIRTYPES_ASPHALT  = 1 << AIRTYPE_ASPHALT,   ///< Asphalt surface
 	AIRTYPES_WATER    = 1 << AIRTYPE_WATER,     ///< Water surface
-	AIRTYPES_ALL      = AIRTYPES_GRAVEL | AIRTYPES_ASPHALT | AIRTYPES_WATER,
+	AIRTYPES_DARK     = 1 << AIRTYPE_DARK,      ///< Dark surface
+	AIRTYPES_YELLOW   = 1 << AIRTYPE_YELLOW,    ///< Yellow surface
+	AIRTYPES_ALL      = AIRTYPES_GRAVEL | AIRTYPES_ASPHALT | AIRTYPES_WATER | AIRTYPES_DARK | AIRTYPES_YELLOW,
 	INVALID_AIRTYPES  = UINT16_MAX,             ///< Invalid airtypes
 };
 DECLARE_ENUM_AS_BIT_SET(AirTypes)

src/lang/english.txt

@@ -2983,9 +2983,11 @@ STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Dock
 STR_TOOLBAR_AIRPORT_GRAVEL_CONSTRUCTION_CAPTION                 :Gravel Airport Construction
 STR_TOOLBAR_AIRPORT_ASPHALT_CONSTRUCTION_CAPTION                :Asphalt Airport Construction
 STR_TOOLBAR_AIRPORT_WATER_CONSTRUCTION_CAPTION                  :Water Airport Construction
+STR_TOOLBAR_AIRPORT_DARK_CONSTRUCTION_CAPTION                   :Darker Airport Construction
+STR_TOOLBAR_AIRPORT_YELLOW_CONSTRUCTION_CAPTION                 :Drawn Tracks Airport Construction
 
 # Airport menu text
-###length 3
+###length 5
 STR_TOOLBAR_AIRPORT_GRAVEL_MENU_TEXT                            :Gravel airport construction
 STR_TOOLBAR_AIRPORT_ASPHALT_MENU_TEXT                           :Asphalt airport construction
 STR_TOOLBAR_AIRPORT_WATER_MENU_TEXT                             :Water airport construction
@@ -3018,6 +3020,8 @@ STR_TOOLBAR_AIRPORT_TOGGLE_GROUND_TOOLBAR                      :{BLACK}Click ove
 STR_AIRTYPE_NAME_GRAVEL                                         :Gravel airport
 STR_AIRTYPE_NAME_ASPHALT                                        :Asphalt airport
 STR_AIRTYPE_NAME_WATER                                          :Water airport
+STR_AIRTYPE_NAME_DARK                                           :Darker airport
+STR_AIRTYPE_NAME_YELLOW                                         :Drawn tracks airport
 
 # Airport infrastructure construction window
 STR_BUILD_AIRPORT_INFRA_NO_CATCH_CAPTION                        :{WHITE}Infrastructure without cargo catchment
@@ -4468,6 +4472,8 @@ STR_REPLACE_TRAM_VEHICLES                                       :Tramway Vehicle
 STR_REPLACE_AIRCRAFT_GRAVEL_VEHICLES                            :Gravel aircraft
 STR_REPLACE_AIRCRAFT_ASPHALT_VEHICLES                           :Asphalt aircraft
 STR_REPLACE_AIRCRAFT_WATER_VEHICLES                             :Water aircraft
+STR_REPLACE_AIRCRAFT_DARK_VEHICLES                              :Dark aircraft
+STR_REPLACE_AIRCRAFT_YELLOW_VEHICLES                            :Drawn tracks aircraft
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wagon removal ({STRING1}): {ORANGE}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Make autoreplace keep the length of a train the same by removing wagons (starting at the front), if replacing the engine would make the train longer

src/station_cmd.cpp

@@ -2756,7 +2756,7 @@ static void DrawAirportFences(TileInfo *ti)
 	PaletteID palette = COMPANY_SPRITE_COLOUR(GetTileOwner(ti->tile));
 	for (DiagDirection dir = DIAGDIR_BEGIN; dir < DIAGDIR_END; dir++) {
 		TileIndex neighbour = TileAddByDiagDir(ti->tile, dir);
-		if (IsValidTile(neighbour) && IsAirportTileOfStation(neighbour, st_id)) continue;
+		if (IsValidTile(neighbour) && (IsAirportTileOfStation(neighbour, st_id) || IsTileType(neighbour, MP_OBJECT))) continue;
 		AddSortableSpriteToDraw(SPR_TRACK_FENCE_FLAT_Y - (dir % 2), palette,
 		ti->x + x_off_air_fence[dir], ti->y + y_off_air_fence[dir], (dir % 2) ? 16 : 1, (dir % 2) ? 1 : 16, 4, ti->z);
 	}