--- a/src/openttd.cpp Thu Aug 16 08:22:36 2007 +0000
+++ b/src/openttd.cpp Thu Aug 16 08:23:58 2007 +0000
@@ -299,9 +299,6 @@
{
UnInitWindowSystem();
- /* Uninitialize airport state machines */
- UnInitializeAirports();
-
/* Uninitialize variables that are allocated dynamically */
_Town_pool.CleanPool();
_Industry_pool.CleanPool();
@@ -497,9 +494,6 @@
/* initialize screenshot formats */
InitializeScreenshotFormats();
- /* initialize airport state machines */
- InitializeAirports();
-
/* initialize all variables that are allocated dynamically */
InitializeDynamicVariables();
@@ -1495,43 +1489,14 @@
* d) when aircraft are loaded, they will need updating
*/
switch (st->airport_type) {
- case AT_SMALL:
- {
- ResetAirportToNewGRFSpec(t, st, 0x4450414F, 0);
- }
- break;
- case AT_LARGE:
- {
- ResetAirportToNewGRFSpec(t, st, 0x4450414F, 1);
- }
- break;
- case AT_HELIPORT:
- {
- ResetAirportToNewGRFSpec(t, st, 0x4450414F, 2);
- }
- break;
- case AT_COMMUTER:
- {
- ResetAirportToNewGRFSpec(t, st, 0x5850414F, 0);
- }
- break;
- case AT_METROPOLITAN:
- {
- ResetAirportToNewGRFSpec(t, st, 0x5850414F, 1);
- }
- break;
- case AT_INTERNATIONAL:
- {
- ResetAirportToNewGRFSpec(t, st, 0x5850414F, 2);
- }
- break;
- case AT_HELIDEPOT:
- {
- ResetAirportToNewGRFSpec(t, st, 0x5850414F, 3);
- }
- break;
- default:
- break;
+ default: break;
+ case AT_SMALL: ResetAirportToNewGRFSpec(t, st, 0x4450414F, 0); break;
+ case AT_LARGE: ResetAirportToNewGRFSpec(t, st, 0x4450414F, 1); break;
+ case AT_HELIPORT: ResetAirportToNewGRFSpec(t, st, 0x4450414F, 2); break;
+ case AT_COMMUTER: ResetAirportToNewGRFSpec(t, st, 0x5850414F, 0); break;
+ case AT_METROPOLITAN: ResetAirportToNewGRFSpec(t, st, 0x5850414F, 1); break;
+ case AT_INTERNATIONAL: ResetAirportToNewGRFSpec(t, st, 0x5850414F, 2); break;
+ case AT_HELIDEPOT: ResetAirportToNewGRFSpec(t, st, 0x5850414F, 3); break;
}
}
break;