summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-06-12 19:44:47 +0000
committeryexo <yexo@openttd.org>2009-06-12 19:44:47 +0000
commitea03c76bd61372c789d2bbc6f106c7e8b626de22 (patch)
tree5d08dd7629cbec65d218ea47a1a1ab146a90bea2
parent1e9ddd18b395a25047665c2f9cd632bb564c9028 (diff)
downloadopenttd-ea03c76bd61372c789d2bbc6f106c7e8b626de22.tar.xz
(svn r16569) -Codechange: remove the gaps in the AirportTiles enum
-rw-r--r--src/airport.cpp200
-rw-r--r--src/station_cmd.cpp2
2 files changed, 101 insertions, 101 deletions
diff --git a/src/airport.cpp b/src/airport.cpp
index ab36cd472..e7aae33f5 100644
--- a/src/airport.cpp
+++ b/src/airport.cpp
@@ -14,106 +14,106 @@
/* 8-66 are mapped to 0-58, 83+ are mapped to 59+ */
enum AirportTiles {
- APT_APRON = 8,
- APT_APRON_FENCE_NW = 9,
- APT_APRON_FENCE_SW = 10,
- APT_STAND = 11,
- APT_APRON_W = 12,
- APT_APRON_S = 13,
- APT_APRON_VER_CROSSING_S = 14,
- APT_APRON_HOR_CROSSING_W = 15,
- APT_APRON_VER_CROSSING_N = 16,
- APT_APRON_HOR_CROSSING_E = 17,
- APT_APRON_E = 18,
- APT_ARPON_N = 19,
- APT_APRON_HOR = 20,
- APT_APRON_N_FENCE_SW = 21,
- APT_RUNWAY_1 = 22,
- APT_RUNWAY_2 = 23,
- APT_RUNWAY_3 = 24,
- APT_RUNWAY_4 = 25,
- APT_RUNWAY_END_FENCE_SE = 26,
- APT_BUILDING_2 = 27,
- APT_TOWER_FENCE_SW = 28,
- APT_ROUND_TERMINAL = 29,
- APT_BUILDING_3 = 30,
- APT_BUILDING_1 = 31,
- APT_DEPOT_SE = 32,
- APT_STAND_1 = 33,
- APT_STAND_PIER_NE = 34,
- APT_PIER_NW_NE = 35,
- APT_PIER = 36,
- APT_EMPTY = 37,
- APT_EMPTY_FENCE_NE = 38,
- APT_RADAR_GRASS_FENCE_SW = 39,
- /* 40-50 are for turning the radar */
- APT_RADIO_TOWER_FENCE_NE = 51,
- APT_SMALL_BUILDING_3 = 52,
- APT_SMALL_BUILDING_2 = 53,
- APT_SMALL_BUILDING_1 = 54,
- APT_GRASS_FENCE_SW = 55,
- APT_GRASS_2 = 56,
- APT_GRASS_1 = 57,
- APT_GRASS_FENCE_NE_FLAG = 58,
- /* 59-61 are for flag animation */
- APT_RUNWAY_SMALL_NEAR_END = 62,
- APT_RUNWAY_SMALL_MIDDLE = 63,
- APT_RUNWAY_SMALL_FAR_END = 64,
- APT_SMALL_DEPOT_SE = 65,
- APT_HELIPORT = 66,
- APT_RUNWAY_END = 83,
- APT_RUNWAY_5 = 84,
- APT_TOWER = 85,
- APT_SMALL_DEPOT_SE_2 = 86, // unused (copy of 65)
- APT_APRON_FENCE_NE = 87,
- APT_RUNWAY_END_FENCE_NW = 88,
- APT_RUNWAY_FENCE_NW = 89,
- APT_RADAR_FENCE_SW = 90,
- /* 91-101 are for turning the radar */
- APT_RADAR_FENCE_NE = 102,
- /* 103-113 are for turning the radar */
- APT_HELIPAD_1 = 114,
- APT_HELIPAD_2_FENCE_NW = 115,
- APT_HELIPAD_2 = 116,
- APT_APRON_FENCE_NE_SW = 117,
- APT_RUNWAY_END_FENCE_NW_SW = 118,
- APT_RUNWAY_END_FENCE_SE_SW = 119,
- APT_RUNWAY_END_FENCE_NE_NW = 120,
- APT_RUNWAY_END_FENCE_NE_SE = 121,
- APT_HELIPAD_2_FENCE_NE_SE = 122,
- APT_APRON_FENCE_SE_SW = 123,
- APT_LOW_BUILDING_FENCE_N = 124,
- APT_ROT_RUNWAY_FENCE_NE = 125, // unused
- APT_ROT_RUNWAY_END_FENCE_NE= 126, // unused
- APT_ROT_RUNWAY_FENCE_SW = 127, // unused
- APT_ROT_RUNWAY_END_FENCE_SW= 128, // unused
- APT_DEPOT_SW = 129, // unused
- APT_DEPOT_NW = 130, // unused
- APT_DEPOT_NE = 131, // unused
- APT_HELIPAD_2_FENCE_SE_SW = 132, // unused
- APT_HELIPAD_2_FENCE_SE = 133, // unused
- APT_LOW_BUILDING_FENCE_NW = 134,
- APT_LOW_BUILDING_FENCE_NE = 135, // unused
- APT_LOW_BUILDING_FENCE_SW = 136, // unused
- APT_LOW_BUILDING_FENCE_SE = 137, // unused
- APT_STAND_FENCE_NE = 138, // unused
- APT_STAND_FENCE_SE = 139, // unused
- APT_STAND_FENCE_SW = 140, // unused
- APT_APRON_FENCE_NE_2 = 141, // unused (copy of 87)
- APT_APRON_FENCE_SE = 142,
- APT_HELIPAD_2_FENCE_NW_SW = 143, // unused
- APT_HELIPAD_2_FENCE_SW = 144, // unused
- APT_RADAR_FENCE_SE = 145, // unused
- /* 146-156 used for radar rotation */
- APT_HELIPAD_3_FENCE_SE_SW = 157,
- APT_HELIPAD_3_FENCE_NW_SW = 158,
- APT_HELIPAD_3_FENCE_NW = 159,
- APT_LOW_BUILDING = 160,
- APT_APRON_FENCE_NE_SE = 161,
- APT_APRON_HALF_EAST = 162,
- APT_APRON_HALF_WEST = 163,
- APT_GRASS_FENCE_NE_FLAG_2 = 164,
- /* 165-167 used for flag animation */
+ APT_APRON = 0,
+ APT_APRON_FENCE_NW = 1,
+ APT_APRON_FENCE_SW = 2,
+ APT_STAND = 3,
+ APT_APRON_W = 4,
+ APT_APRON_S = 5,
+ APT_APRON_VER_CROSSING_S = 6,
+ APT_APRON_HOR_CROSSING_W = 7,
+ APT_APRON_VER_CROSSING_N = 8,
+ APT_APRON_HOR_CROSSING_E = 9,
+ APT_APRON_E = 10,
+ APT_ARPON_N = 11,
+ APT_APRON_HOR = 12,
+ APT_APRON_N_FENCE_SW = 13,
+ APT_RUNWAY_1 = 14,
+ APT_RUNWAY_2 = 15,
+ APT_RUNWAY_3 = 16,
+ APT_RUNWAY_4 = 17,
+ APT_RUNWAY_END_FENCE_SE = 18,
+ APT_BUILDING_2 = 19,
+ APT_TOWER_FENCE_SW = 20,
+ APT_ROUND_TERMINAL = 21,
+ APT_BUILDING_3 = 22,
+ APT_BUILDING_1 = 23,
+ APT_DEPOT_SE = 24,
+ APT_STAND_1 = 25,
+ APT_STAND_PIER_NE = 26,
+ APT_PIER_NW_NE = 27,
+ APT_PIER = 28,
+ APT_EMPTY = 29,
+ APT_EMPTY_FENCE_NE = 30,
+ APT_RADAR_GRASS_FENCE_SW = 31,
+ /* 32-42 are for turning the radar */
+ APT_RADIO_TOWER_FENCE_NE = 43,
+ APT_SMALL_BUILDING_3 = 44,
+ APT_SMALL_BUILDING_2 = 45,
+ APT_SMALL_BUILDING_1 = 46,
+ APT_GRASS_FENCE_SW = 47,
+ APT_GRASS_2 = 48,
+ APT_GRASS_1 = 49,
+ APT_GRASS_FENCE_NE_FLAG = 50,
+ /* 51-53 are for flag animation */
+ APT_RUNWAY_SMALL_NEAR_END = 54,
+ APT_RUNWAY_SMALL_MIDDLE = 55,
+ APT_RUNWAY_SMALL_FAR_END = 56,
+ APT_SMALL_DEPOT_SE = 57,
+ APT_HELIPORT = 58,
+ APT_RUNWAY_END = 59,
+ APT_RUNWAY_5 = 60,
+ APT_TOWER = 61,
+ APT_SMALL_DEPOT_SE_2 = 62, // unused (copy of APT_SMALL_DEPOT_SE)
+ APT_APRON_FENCE_NE = 63,
+ APT_RUNWAY_END_FENCE_NW = 64,
+ APT_RUNWAY_FENCE_NW = 65,
+ APT_RADAR_FENCE_SW = 66,
+ /* 67-77 are for turning the radar */
+ APT_RADAR_FENCE_NE = 78,
+ /* 79-89 are for turning the radar */
+ APT_HELIPAD_1 = 90,
+ APT_HELIPAD_2_FENCE_NW = 91,
+ APT_HELIPAD_2 = 92,
+ APT_APRON_FENCE_NE_SW = 93,
+ APT_RUNWAY_END_FENCE_NW_SW = 94,
+ APT_RUNWAY_END_FENCE_SE_SW = 95,
+ APT_RUNWAY_END_FENCE_NE_NW = 96,
+ APT_RUNWAY_END_FENCE_NE_SE = 97,
+ APT_HELIPAD_2_FENCE_NE_SE = 98,
+ APT_APRON_FENCE_SE_SW = 99,
+ APT_LOW_BUILDING_FENCE_N = 100,
+ APT_ROT_RUNWAY_FENCE_NE = 101, // unused
+ APT_ROT_RUNWAY_END_FENCE_NE= 102, // unused
+ APT_ROT_RUNWAY_FENCE_SW = 103, // unused
+ APT_ROT_RUNWAY_END_FENCE_SW= 104, // unused
+ APT_DEPOT_SW = 105, // unused
+ APT_DEPOT_NW = 106, // unused
+ APT_DEPOT_NE = 107, // unused
+ APT_HELIPAD_2_FENCE_SE_SW = 108, // unused
+ APT_HELIPAD_2_FENCE_SE = 109, // unused
+ APT_LOW_BUILDING_FENCE_NW = 110,
+ APT_LOW_BUILDING_FENCE_NE = 111, // unused
+ APT_LOW_BUILDING_FENCE_SW = 112, // unused
+ APT_LOW_BUILDING_FENCE_SE = 113, // unused
+ APT_STAND_FENCE_NE = 114, // unused
+ APT_STAND_FENCE_SE = 115, // unused
+ APT_STAND_FENCE_SW = 116, // unused
+ APT_APRON_FENCE_NE_2 = 117, // unused (copy of APT_APRON_FENCE_NE)
+ APT_APRON_FENCE_SE = 118,
+ APT_HELIPAD_2_FENCE_NW_SW = 119, // unused
+ APT_HELIPAD_2_FENCE_SW = 120, // unused
+ APT_RADAR_FENCE_SE = 121, // unused
+ /* 122-132 used for radar rotation */
+ APT_HELIPAD_3_FENCE_SE_SW = 133,
+ APT_HELIPAD_3_FENCE_NW_SW = 134,
+ APT_HELIPAD_3_FENCE_NW = 135,
+ APT_LOW_BUILDING = 136,
+ APT_APRON_FENCE_NE_SE = 137,
+ APT_APRON_HALF_EAST = 138,
+ APT_APRON_HALF_WEST = 139,
+ APT_GRASS_FENCE_NE_FLAG_2 = 140,
+ /* 141-143 used for flag animation */
};
/** Tiles for Country Airfield (small) */
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index fd4f505a8..2c86a3fa5 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1835,7 +1835,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
const byte *b = _airport_sections[p1];
BEGIN_TILE_LOOP(tile_cur, w, h, tile) {
- MakeAirport(tile_cur, st->owner, st->index, *b - ((*b < 67) ? 8 : 24));
+ MakeAirport(tile_cur, st->owner, st->index, *b);
b++;
} END_TILE_LOOP(tile_cur, w, h, tile)
}