Mercurial > hg > openttd

changeset 14860:1365581b96cb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19456) -Codechange; increase the maximum number of airports
author yexo <yexo@openttd.org>
date Thu, 18 Mar 2010 23:10:35 +0000
parents 304d377a82af
children 399a6521f5fd
files src/airport.h src/newgrf_airport.cpp src/table/airport_defaults.h
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/airport.h
+++ b/src/airport.h
@@ -37,7 +37,8 @@
 	AT_INTERCON      =   7,
 	AT_HELISTATION   =   8,
 	AT_OILRIG        =   9,
-	NUM_AIRPORTS     =  10,
+	NEW_AIRPORT_OFFSET = 10,
+	NUM_AIRPORTS     =  128,
 	AT_DUMMY         = 255
 };
 
--- a/src/newgrf_airport.cpp
+++ b/src/newgrf_airport.cpp
@@ -63,7 +63,7 @@
 {
 	extern const AirportSpec _origin_airport_specs[];
 	memset(&AirportSpec::specs, 0, sizeof(AirportSpec::specs));
-	memcpy(&AirportSpec::specs, &_origin_airport_specs, sizeof(AirportSpec) * NUM_AIRPORTS);
+	memcpy(&AirportSpec::specs, &_origin_airport_specs, sizeof(AirportSpec) * NEW_AIRPORT_OFFSET);
 }
 
 /**
--- a/src/table/airport_defaults.h
+++ b/src/table/airport_defaults.h
@@ -404,7 +404,7 @@
 	AS_GENERIC(&_airportfta_oilrig, NULL, 0, NULL, 0, 1, 1, 0, 4, 0, 0, ATP_TTDP_OILRIG, APC_HELIPORT, STR_NULL, false),
 };
 
-assert_compile(NUM_AIRPORTS == lengthof(_origin_airport_specs));
+assert_compile(NEW_AIRPORT_OFFSET == lengthof(_origin_airport_specs));
 
 #undef AS
 #undef AS_ND