Changeset - r15732:516b1939e794
[Not reviewed]
master
0 3 0
rubidium - 14 years ago 2010-08-08 09:07:40
rubidium@openttd.org
(svn r20409) -Codechange: reduce the number of includes needed by newgrf.h
3 files changed with 8 insertions and 9 deletions:
0 comments (0 inline, 0 general)
src/newgrf.h
Show inline comments
 
@@ -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 @@ struct GRFFile {
 
	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 @@ struct GRFLoadedFeatures {
 
/* 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
 

	
src/newgrf_debug.h
Show inline comments
 
@@ -13,6 +13,8 @@
 
#define NEWGRF_DEBUG_H
 

	
 
#include "newgrf.h"
 
#include "core/smallvec_type.hpp"
 
#include "tile_type.h"
 
#include "vehicle_type.h"
 

	
 
/** Current state of spritepicker */
src/town_cmd.cpp
Show inline comments
 
@@ -27,6 +27,7 @@
 
#include "newgrf_house.h"
 
#include "newgrf_commons.h"
 
#include "newgrf_text.h"
 
#include "newgrf_config.h"
 
#include "autoslope.h"
 
#include "tunnelbridge_map.h"
 
#include "strings_func.h"
0 comments (0 inline, 0 general)