Mercurial > hg > openttd

changeset 14866:d225d2ea463b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19462) -Codechange: use the AS_GENERIC macro also for the dummy airport
author yexo <yexo@openttd.org>
date Fri, 19 Mar 2010 00:34:38 +0000
parents 40c52be7fb8d
children d2be152e6d09
files src/newgrf_airport.cpp src/station_base.h src/table/airport_defaults.h
diffstat 3 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_airport.cpp
+++ b/src/newgrf_airport.cpp
@@ -23,8 +23,6 @@
 
 AirportOverrideManager _airport_mngr(NEW_AIRPORT_OFFSET, NUM_AIRPORTS, AT_INVALID);
 
-AirportSpec AirportSpec::dummy = {NULL, NULL, 0, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR, STR_NULL, ATP_TTDP_LARGE, APC_BEGIN, false, {AT_INVALID, 0, NULL, NULL, AT_INVALID}};
-
 AirportSpec AirportSpec::specs[NUM_AIRPORTS];
 
 /**
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -60,7 +60,6 @@
 
 	const AirportFTAClass *GetFTA() const
 	{
-		if (this->tile == INVALID_TILE) return GetAirport(AT_DUMMY);
 		return this->GetSpec()->fsm;
 	}
 };
--- a/src/table/airport_defaults.h
+++ b/src/table/airport_defaults.h
@@ -406,6 +406,8 @@
 
 assert_compile(NEW_AIRPORT_OFFSET == lengthof(_origin_airport_specs));
 
+AirportSpec AirportSpec::dummy = AS_GENERIC(&_airportfta_dummy, NULL, 0, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR, ATP_TTDP_LARGE, APC_BEGIN, STR_NULL, false);
+
 #undef AS
 #undef AS_ND
 #undef AS_GENERIC