summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-01-21 14:15:38 +0000
committertruelight <truelight@openttd.org>2007-01-21 14:15:38 +0000
commitbb8f3a1dff8deaf2968f6da31bfaaadc41c8066d (patch)
tree2fbd149c9135c9c88195a1bcddec7a6d3c3d684d
parent805246015f32d9ecd601c9d6d17513f53ebeab44 (diff)
downloadopenttd-bb8f3a1dff8deaf2968f6da31bfaaadc41c8066d.tar.xz
(svn r8305) -Codechange: defining 'static const' in a header is a bit weird.
Above that, wince-gcc gave "unused variable" on every file which included airport.h... pretty annoying ;)
-rw-r--r--src/aircraft_cmd.cpp5
-rw-r--r--src/airport.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 098162c1d..9263c937c 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -26,6 +26,11 @@
#include "newgrf_sound.h"
#include "date.h"
+// this maps the terminal to its corresponding state and block flag
+// currently set for 10 terms, 4 helipads
+static const byte _airport_terminal_state[] = {2, 3, 4, 5, 6, 7, 19, 20, 0, 0, 8, 9, 21, 22};
+static const byte _airport_terminal_flag[] = {0, 1, 2, 3, 4, 5, 22, 23, 0, 0, 6, 7, 24, 25};
+
static bool AirportMove(Vehicle *v, const AirportFTAClass *apc);
static bool AirportSetBlocks(Vehicle *v, AirportFTA *current_pos, const AirportFTAClass *apc);
static bool AirportHasBlock(Vehicle *v, const AirportFTA *current_pos, const AirportFTAClass *apc);
diff --git a/src/airport.h b/src/airport.h
index 207de84fa..75c275e2d 100644
--- a/src/airport.h
+++ b/src/airport.h
@@ -75,11 +75,6 @@ enum {
HELIPAD4 = 22
};
-// this maps the terminal to its corresponding state and block flag
-// currently set for 10 terms, 4 helipads
-static const byte _airport_terminal_state[] = {2, 3, 4, 5, 6, 7, 19, 20, 0, 0, 8, 9, 21, 22};
-static const byte _airport_terminal_flag[] = {0, 1, 2, 3, 4, 5, 22, 23, 0, 0, 6, 7, 24, 25};
-
/* Movement Blocks on Airports */
// blocks (eg_airport_flags)
enum {