(svn r8305) -Codechange: defining 'static const' in a header is a bit weird.
authortruelight
Sun, 21 Jan 2007 14:15:38 +0000
changeset 6005 cf29375327f9
parent 6004 03795fd01cb8
child 6006 56ccbc3ec899
(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
src/airport.h
--- a/src/aircraft_cmd.cpp	Sun Jan 21 14:14:27 2007 +0000
+++ b/src/aircraft_cmd.cpp	Sun Jan 21 14:15:38 2007 +0000
@@ -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);
--- a/src/airport.h	Sun Jan 21 14:14:27 2007 +0000
+++ b/src/airport.h	Sun Jan 21 14:15:38 2007 +0000
@@ -75,11 +75,6 @@
 	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 {