mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19191) -Codechange: move AirportTileSpec to newgrf_airporttiles.h

release/1.1
yexo 2010-02-22 14:09:30 +00:00
parent 5052777d0b
commit 40f6e69ae9
6 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/openttd_vs80.vcproj
View File

@ -1147,6 +1147,10 @@
RelativePath=".\..\src\newgrf.h" RelativePath=".\..\src\newgrf.h"
> >
</File> </File>
<File
RelativePath=".\..\src\newgrf_airporttiles.h"
>
</File>
<File <File
RelativePath=".\..\src\newgrf_callbacks.h" RelativePath=".\..\src\newgrf_callbacks.h"
> >
@ -3171,6 +3175,10 @@
RelativePath=".\..\src\newgrf.cpp" RelativePath=".\..\src\newgrf.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\newgrf_airporttiles.cpp"
>
</File>
<File <File
RelativePath=".\..\src\newgrf_canal.cpp" RelativePath=".\..\src\newgrf_canal.cpp"
> >

8
projects/openttd_vs90.vcproj
View File

@ -1144,6 +1144,10 @@
RelativePath=".\..\src\newgrf.h" RelativePath=".\..\src\newgrf.h"
> >
</File> </File>
<File
RelativePath=".\..\src\newgrf_airporttiles.h"
>
</File>
<File <File
RelativePath=".\..\src\newgrf_callbacks.h" RelativePath=".\..\src\newgrf_callbacks.h"
> >
@ -3168,6 +3172,10 @@
RelativePath=".\..\src\newgrf.cpp" RelativePath=".\..\src\newgrf.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\newgrf_airporttiles.cpp"
>
</File>
<File <File
RelativePath=".\..\src\newgrf_canal.cpp" RelativePath=".\..\src\newgrf_canal.cpp"
> >

2
source.list
View File

@ -196,6 +196,7 @@ network/network_server.h
network/network_type.h network/network_type.h
network/network_udp.h network/network_udp.h
newgrf.h newgrf.h
newgrf_airporttiles.h
newgrf_callbacks.h newgrf_callbacks.h
newgrf_canal.h newgrf_canal.h
newgrf_cargo.h newgrf_cargo.h
@ -741,6 +742,7 @@ spriteloader/spriteloader.hpp
# NewGRF # NewGRF
newgrf.cpp newgrf.cpp
newgrf_airporttiles.cpp
newgrf_canal.cpp newgrf_canal.cpp
newgrf_cargo.cpp newgrf_cargo.cpp
newgrf_commons.cpp newgrf_commons.cpp

13
src/airport.cpp
View File

@ -18,7 +18,6 @@
#include "settings_type.h" #include "settings_type.h"
#include "table/airporttile_ids.h" #include "table/airporttile_ids.h"
#include "table/airport_defaults.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::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}; AirportSpec AirportSpec::oilrig = {NULL, NULL, 0, 1, 1, 0, 4, MIN_YEAR, MIN_YEAR};
@ -37,18 +36,6 @@ AirportSpec AirportSpec::oilrig = {NULL, NULL, 0, 1, 1, 0, 4, MIN_YEAR, MIN_YEAR
return &_origin_airport_specs[type]; 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 /* Uncomment this to print out a full report of the airport-structure
* You should either use * You should either use
* - true: full-report, print out every state and choice with string-names * - true: full-report, print out every state and choice with string-names

11
src/airport.h
View File

@ -70,17 +70,6 @@ struct AirportSpec {
static AirportSpec oilrig; 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 { enum {
AMED_NOSPDCLAMP = 1 << 0, AMED_NOSPDCLAMP = 1 << 0,
AMED_TAKEOFF = 1 << 1, AMED_TAKEOFF = 1 << 1,

1
src/station_cmd.cpp
View File

@ -48,6 +48,7 @@
#include "company_base.h" #include "company_base.h"
#include "newgrf.h" #include "newgrf.h"
#include "table/airporttile_ids.h" #include "table/airporttile_ids.h"
#include "newgrf_airporttiles.h"
#include "table/strings.h" #include "table/strings.h"