From bb8f3a1dff8deaf2968f6da31bfaaadc41c8066d Mon Sep 17 00:00:00 2001 From: truelight Date: Sun, 21 Jan 2007 14:15:38 +0000 Subject: [PATCH] (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 ;) --- src/aircraft_cmd.cpp | 5 +++++ src/airport.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp index 098162c1d3..9263c937cb 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 207de84fa2..75c275e2dc 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 {