Changeset - r14604:fe6b640c98bf
[Not reviewed]
master
0 6 0
yexo - 15 years ago 2010-02-22 14:09:30
yexo@openttd.org
(svn r19191) -Codechange: move AirportTileSpec to newgrf_airporttiles.h
6 files changed with 19 insertions and 24 deletions:
0 comments (0 inline, 0 general)
projects/openttd_vs80.vcproj
Show inline comments
 
@@ -1148,6 +1148,10 @@
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_airporttiles.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_callbacks.h"
 
				>
 
			</File>
 
@@ -3172,6 +3176,10 @@
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_airporttiles.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_canal.cpp"
 
				>
 
			</File>
projects/openttd_vs90.vcproj
Show inline comments
 
@@ -1145,6 +1145,10 @@
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_airporttiles.h"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_callbacks.h"
 
				>
 
			</File>
 
@@ -3169,6 +3173,10 @@
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_airporttiles.cpp"
 
				>
 
			</File>
 
			<File
 
				RelativePath=".\..\src\newgrf_canal.cpp"
 
				>
 
			</File>
source.list
Show inline comments
 
@@ -196,6 +196,7 @@ network/network_server.h
 
network/network_type.h
 
network/network_udp.h
 
newgrf.h
 
newgrf_airporttiles.h
 
newgrf_callbacks.h
 
newgrf_canal.h
 
newgrf_cargo.h
 
@@ -741,6 +742,7 @@ spriteloader/spriteloader.hpp
 

	
 
# NewGRF
 
newgrf.cpp
 
newgrf_airporttiles.cpp
 
newgrf_canal.cpp
 
newgrf_cargo.cpp
 
newgrf_commons.cpp
src/airport.cpp
Show inline comments
 
@@ -18,7 +18,6 @@
 
#include "settings_type.h"
 
#include "table/airporttile_ids.h"
 
#include "table/airport_defaults.h"
 
#include "table/airporttiles.h"
 

	
 
AirportSpec AirportSpec::dummy = {NULL, NULL, 0, 0, 0, 0, 0, MIN_YEAR, MIN_YEAR};
 
AirportSpec AirportSpec::oilrig = {NULL, NULL, 0, 1, 1, 0, 4, MIN_YEAR, MIN_YEAR};
 
@@ -37,18 +36,6 @@ AirportSpec AirportSpec::oilrig = {NULL,
 
	return &_origin_airport_specs[type];
 
}
 

	
 
/**
 
 * Retrieve airport tile spec for the given airport tile
 
 * @param gfx index of airport tile
 
 * @return A pointer to the corresponding AirportTileSpec
 
 */
 
/* static */ const AirportTileSpec *AirportTileSpec::Get(StationGfx gfx)
 
{
 
	assert(gfx < NUM_AIRPORTTILES);
 
	extern const AirportTileSpec _origin_airporttile_specs[];
 
	return &_origin_airporttile_specs[gfx];
 
}
 

	
 
/* Uncomment this to print out a full report of the airport-structure
 
 * You should either use
 
 * - true: full-report, print out every state and choice with string-names
src/airport.h
Show inline comments
 
@@ -70,17 +70,6 @@ struct AirportSpec {
 
	static AirportSpec oilrig;
 
};
 

	
 

	
 
/**
 
 * Defines the data structure of each indivudual tile of an airport.
 
 */
 
struct AirportTileSpec {
 
	uint16 animation_info;                ///< Information about the animation (is it looping, how many loops etc)
 
	uint8 animation_speed;                ///< The speed of the animation
 

	
 
	static const AirportTileSpec *Get(StationGfx gfx);
 
};
 

	
 
enum {
 
	AMED_NOSPDCLAMP = 1 << 0,
 
	AMED_TAKEOFF    = 1 << 1,
src/station_cmd.cpp
Show inline comments
 
@@ -48,6 +48,7 @@
 
#include "company_base.h"
 
#include "newgrf.h"
 
#include "table/airporttile_ids.h"
 
#include "newgrf_airporttiles.h"
 

	
 
#include "table/strings.h"
 

	
0 comments (0 inline, 0 general)