Mercurial > hg > openttd
changeset 15742:3281d1dc3c11 draft
(svn r20409) -Codechange: reduce the number of includes needed by newgrf.h
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sun, 08 Aug 2010 09:07:40 +0000 |
parents | 216b0d784cc5 |
children | db77e07563af |
files | src/newgrf.h src/newgrf_debug.h src/town_cmd.cpp |
diffstat | 3 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.h +++ b/src/newgrf.h @@ -12,12 +12,8 @@ #ifndef NEWGRF_H #define NEWGRF_H -#include "newgrf_config.h" #include "cargotype.h" -#include "industry_type.h" -#include "station_type.h" #include "rail_type.h" -#include "house_type.h" enum GrfLoadingStage { GLS_FILESCAN, @@ -106,10 +102,10 @@ uint sound_offset; uint16 num_sounds; - StationSpec **stations; - HouseSpec **housespec; - IndustrySpec **industryspec; - IndustryTileSpec **indtspec; + struct StationSpec **stations; + struct HouseSpec **housespec; + struct IndustrySpec **industryspec; + struct IndustryTileSpec **indtspec; struct AirportSpec **airportspec; struct AirportTileSpec **airtspec; @@ -159,7 +155,7 @@ /* Indicates which are the newgrf features currently loaded ingame */ extern GRFLoadedFeatures _loaded_newgrf_features; -void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage); +void LoadNewGRFFile(struct GRFConfig *config, uint file_index, GrfLoadingStage stage); void LoadNewGRF(uint load_index, uint file_index); void ReloadNewGRFData(); // in saveload/afterload.cpp