summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-08-08 09:07:40 +0000
committerrubidium <rubidium@openttd.org>2010-08-08 09:07:40 +0000
commit412bb37f595756eea74d02d3163d7043f84cf93a (patch)
tree94c5378291258d9973500e2d1109a5bf0240bbe5
parent5f874b90f92c3f7f6578c5f41eef4dce0107f9e3 (diff)
downloadopenttd-412bb37f595756eea74d02d3163d7043f84cf93a.tar.xz
(svn r20409) -Codechange: reduce the number of includes needed by newgrf.h
-rw-r--r--src/newgrf.h14
-rw-r--r--src/newgrf_debug.h2
-rw-r--r--src/town_cmd.cpp1
3 files changed, 8 insertions, 9 deletions
diff --git a/src/newgrf.h b/src/newgrf.h
index e9d5b9573..64bfe58df 100644
--- 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 @@ 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
diff --git a/src/newgrf_debug.h b/src/newgrf_debug.h
index f217a8fc7..c31b48ccb 100644
--- a/src/newgrf_debug.h
+++ b/src/newgrf_debug.h
@@ -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 */
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index bf877f5b5..6446ff2f8 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -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"