equal
deleted
inserted
replaced
41 _airport_entries_dummy, |
41 _airport_entries_dummy, |
42 AirportFTAClass::ALL, |
42 AirportFTAClass::ALL, |
43 _airport_fta_dummy, |
43 _airport_fta_dummy, |
44 NULL, |
44 NULL, |
45 0, |
45 0, |
46 0, 0, |
46 0, 0, 0, |
47 0, |
47 0, |
48 0 |
48 0 |
49 ); |
49 ); |
50 |
50 |
51 CountryAirport = new AirportFTAClass( |
51 CountryAirport = new AirportFTAClass( |
55 _airport_entries_country, |
55 _airport_entries_country, |
56 AirportFTAClass::ALL | AirportFTAClass::SHORT_STRIP, |
56 AirportFTAClass::ALL | AirportFTAClass::SHORT_STRIP, |
57 _airport_fta_country, |
57 _airport_fta_country, |
58 _airport_depots_country, |
58 _airport_depots_country, |
59 lengthof(_airport_depots_country), |
59 lengthof(_airport_depots_country), |
60 4, 3, |
60 4, 3, 3, |
61 0, |
61 0, |
62 4 |
62 4 |
63 ); |
63 ); |
64 |
64 |
65 CityAirport = new AirportFTAClass( |
65 CityAirport = new AirportFTAClass( |
69 _airport_entries_city, |
69 _airport_entries_city, |
70 AirportFTAClass::ALL, |
70 AirportFTAClass::ALL, |
71 _airport_fta_city, |
71 _airport_fta_city, |
72 _airport_depots_city, |
72 _airport_depots_city, |
73 lengthof(_airport_depots_city), |
73 lengthof(_airport_depots_city), |
74 6, 6, |
74 6, 6, 5, |
75 0, |
75 0, |
76 5 |
76 5 |
77 ); |
77 ); |
78 |
78 |
79 MetropolitanAirport = new AirportFTAClass( |
79 MetropolitanAirport = new AirportFTAClass( |
83 _airport_entries_metropolitan, |
83 _airport_entries_metropolitan, |
84 AirportFTAClass::ALL, |
84 AirportFTAClass::ALL, |
85 _airport_fta_metropolitan, |
85 _airport_fta_metropolitan, |
86 _airport_depots_metropolitan, |
86 _airport_depots_metropolitan, |
87 lengthof(_airport_depots_metropolitan), |
87 lengthof(_airport_depots_metropolitan), |
88 6, 6, |
88 6, 6, 8, |
89 0, |
89 0, |
90 6 |
90 6 |
91 ); |
91 ); |
92 |
92 |
93 InternationalAirport = new AirportFTAClass( |
93 InternationalAirport = new AirportFTAClass( |
97 _airport_entries_international, |
97 _airport_entries_international, |
98 AirportFTAClass::ALL, |
98 AirportFTAClass::ALL, |
99 _airport_fta_international, |
99 _airport_fta_international, |
100 _airport_depots_international, |
100 _airport_depots_international, |
101 lengthof(_airport_depots_international), |
101 lengthof(_airport_depots_international), |
102 7, 7, |
102 7, 7, 17, |
103 0, |
103 0, |
104 8 |
104 8 |
105 ); |
105 ); |
106 |
106 |
107 IntercontinentalAirport = new AirportFTAClass( |
107 IntercontinentalAirport = new AirportFTAClass( |
111 _airport_entries_intercontinental, |
111 _airport_entries_intercontinental, |
112 AirportFTAClass::ALL, |
112 AirportFTAClass::ALL, |
113 _airport_fta_intercontinental, |
113 _airport_fta_intercontinental, |
114 _airport_depots_intercontinental, |
114 _airport_depots_intercontinental, |
115 lengthof(_airport_depots_intercontinental), |
115 lengthof(_airport_depots_intercontinental), |
116 9, 11, |
116 9, 11, 25, |
117 0, |
117 0, |
118 10 |
118 10 |
119 ); |
119 ); |
120 |
120 |
121 Heliport = new AirportFTAClass( |
121 Heliport = new AirportFTAClass( |
125 _airport_entries_heliport_oilrig, |
125 _airport_entries_heliport_oilrig, |
126 AirportFTAClass::HELICOPTERS, |
126 AirportFTAClass::HELICOPTERS, |
127 _airport_fta_heliport_oilrig, |
127 _airport_fta_heliport_oilrig, |
128 NULL, |
128 NULL, |
129 0, |
129 0, |
130 1, 1, |
130 1, 1, 1, |
131 60, |
131 60, |
132 4 |
132 4 |
133 ); |
133 ); |
134 |
134 |
135 Oilrig = new AirportFTAClass( |
135 Oilrig = new AirportFTAClass( |
139 _airport_entries_heliport_oilrig, |
139 _airport_entries_heliport_oilrig, |
140 AirportFTAClass::HELICOPTERS, |
140 AirportFTAClass::HELICOPTERS, |
141 _airport_fta_heliport_oilrig, |
141 _airport_fta_heliport_oilrig, |
142 NULL, |
142 NULL, |
143 0, |
143 0, |
144 1, 1, |
144 1, 1, 0, |
145 54, |
145 54, |
146 3 |
146 3 |
147 ); |
147 ); |
148 |
148 |
149 CommuterAirport = new AirportFTAClass( |
149 CommuterAirport = new AirportFTAClass( |
153 _airport_entries_commuter, |
153 _airport_entries_commuter, |
154 AirportFTAClass::ALL | AirportFTAClass::SHORT_STRIP, |
154 AirportFTAClass::ALL | AirportFTAClass::SHORT_STRIP, |
155 _airport_fta_commuter, |
155 _airport_fta_commuter, |
156 _airport_depots_commuter, |
156 _airport_depots_commuter, |
157 lengthof(_airport_depots_commuter), |
157 lengthof(_airport_depots_commuter), |
158 5, 4, |
158 5, 4, 4, |
159 0, |
159 0, |
160 4 |
160 4 |
161 ); |
161 ); |
162 |
162 |
163 HeliDepot = new AirportFTAClass( |
163 HeliDepot = new AirportFTAClass( |
167 _airport_entries_helidepot, |
167 _airport_entries_helidepot, |
168 AirportFTAClass::HELICOPTERS, |
168 AirportFTAClass::HELICOPTERS, |
169 _airport_fta_helidepot, |
169 _airport_fta_helidepot, |
170 _airport_depots_helidepot, |
170 _airport_depots_helidepot, |
171 lengthof(_airport_depots_helidepot), |
171 lengthof(_airport_depots_helidepot), |
172 2, 2, |
172 2, 2, 2, |
173 0, |
173 0, |
174 4 |
174 4 |
175 ); |
175 ); |
176 |
176 |
177 HeliStation = new AirportFTAClass( |
177 HeliStation = new AirportFTAClass( |
181 _airport_entries_helistation, |
181 _airport_entries_helistation, |
182 AirportFTAClass::HELICOPTERS, |
182 AirportFTAClass::HELICOPTERS, |
183 _airport_fta_helistation, |
183 _airport_fta_helistation, |
184 _airport_depots_helistation, |
184 _airport_depots_helistation, |
185 lengthof(_airport_depots_helistation), |
185 lengthof(_airport_depots_helistation), |
186 4, 2, |
186 4, 2, 3, |
187 0, |
187 0, |
188 4 |
188 4 |
189 ); |
189 ); |
190 } |
190 } |
191 |
191 |
223 const AirportFTAbuildup *apFA, |
223 const AirportFTAbuildup *apFA, |
224 const TileIndexDiffC *depots_, |
224 const TileIndexDiffC *depots_, |
225 const byte nof_depots_, |
225 const byte nof_depots_, |
226 uint size_x_, |
226 uint size_x_, |
227 uint size_y_, |
227 uint size_y_, |
|
228 byte noise_level_, |
228 byte delta_z_, |
229 byte delta_z_, |
229 byte catchment_ |
230 byte catchment_ |
230 ) : |
231 ) : |
231 moving_data(moving_data_), |
232 moving_data(moving_data_), |
232 terminals(terminals_), |
233 terminals(terminals_), |
236 nof_depots(nof_depots_), |
237 nof_depots(nof_depots_), |
237 nofelements(AirportGetNofElements(apFA)), |
238 nofelements(AirportGetNofElements(apFA)), |
238 entry_points(entry_points_), |
239 entry_points(entry_points_), |
239 size_x(size_x_), |
240 size_x(size_x_), |
240 size_y(size_y_), |
241 size_y(size_y_), |
|
242 noise_level(noise_level_), |
241 delta_z(delta_z_), |
243 delta_z(delta_z_), |
242 catchment(catchment_) |
244 catchment(catchment_) |
243 { |
245 { |
244 byte nofterminalgroups, nofhelipadgroups; |
246 byte nofterminalgroups, nofhelipadgroups; |
245 |
247 |