(svn r11664) -Codechange: use more specific ("rail_type.h" instead of "rail.h" that includes way more than only "rail_type.h") includes at some places.
--- a/src/autoreplace_gui.cpp Tue Dec 18 20:38:16 2007 +0000
+++ b/src/autoreplace_gui.cpp Tue Dec 18 20:58:12 2007 +0000
@@ -16,6 +16,7 @@
#include "vehicle_gui.h"
#include "newgrf_engine.h"
#include "group.h"
+#include "rail.h"
static RailType _railtype_selected_in_replace_gui;
--- a/src/bridge_map.h Tue Dec 18 20:38:16 2007 +0000
+++ b/src/bridge_map.h Tue Dec 18 20:58:12 2007 +0000
@@ -8,7 +8,7 @@
#include "direction_func.h"
#include "macros.h"
#include "map.h"
-#include "rail.h"
+#include "rail_type.h"
#include "road_map.h"
#include "tile.h"
--- a/src/elrail.cpp Tue Dec 18 20:38:16 2007 +0000
+++ b/src/elrail.cpp Tue Dec 18 20:58:12 2007 +0000
@@ -53,7 +53,7 @@
#include "functions.h" /* We should REALLY get rid of this goddamn file, as it is butt-ugly */
#include "variables.h" /* ... same here */
#include "landscape.h"
-#include "rail.h"
+#include "rail_type.h"
#include "debug.h"
#include "tunnel_map.h"
#include "road_map.h"
--- a/src/engine.h Tue Dec 18 20:38:16 2007 +0000
+++ b/src/engine.h Tue Dec 18 20:58:12 2007 +0000
@@ -6,7 +6,7 @@
#define ENGINE_H
#include "oldpool.h"
-#include "rail.h"
+#include "rail_type.h"
#include "sound.h"
#include "vehicle.h"
--- a/src/newgrf.cpp Tue Dec 18 20:38:16 2007 +0000
+++ b/src/newgrf.cpp Tue Dec 18 20:58:12 2007 +0000
@@ -48,6 +48,7 @@
#include "table/landscape_sprite.h"
#include "gfxinit.h"
#include "fios.h"
+#include "rail.h"
/* TTDPatch extended GRF format codec
* (c) Petr Baudis 2004 (GPL'd)
--- a/src/newgrf_house.cpp Tue Dec 18 20:38:16 2007 +0000
+++ b/src/newgrf_house.cpp Tue Dec 18 20:58:12 2007 +0000
@@ -10,6 +10,7 @@
#include "viewport.h"
#include "landscape.h"
#include "date.h"
+#include "tile.h"
#include "town.h"
#include "town_map.h"
#include "sound.h"
--- a/src/pathfind.cpp Tue Dec 18 20:38:16 2007 +0000
+++ b/src/pathfind.cpp Tue Dec 18 20:58:12 2007 +0000
@@ -12,7 +12,7 @@
#include "map.h"
#include "tile.h"
#include "pathfind.h"
-#include "rail.h"
+#include "rail_type.h"
#include "debug.h"
#include "tunnel_map.h"
#include "variables.h"
--- a/src/player.h Tue Dec 18 20:38:16 2007 +0000
+++ b/src/player.h Tue Dec 18 20:58:12 2007 +0000
@@ -7,7 +7,7 @@
#include "oldpool.h"
#include "aystar.h"
-#include "rail.h"
+#include "rail_type.h"
#include "road_func.h"
#include "engine.h"
#include "livery.h"
--- a/src/track_func.h Tue Dec 18 20:38:16 2007 +0000
+++ b/src/track_func.h Tue Dec 18 20:58:12 2007 +0000
@@ -514,4 +514,4 @@
return (dir & 0x06) == 0;
}
-#endif /* RAIL_H */
+#endif /* TRACK_FUNC_H */
--- a/src/track_type.h Tue Dec 18 20:38:16 2007 +0000
+++ b/src/track_type.h Tue Dec 18 20:58:12 2007 +0000
@@ -122,4 +122,4 @@
typedef TinyEnumT<TrackdirBits> TrackdirBitsShort;
DECLARE_ENUM_AS_BIT_SET(TrackdirBits);
-#endif /* RAIL_H */
+#endif /* TRACK_TYPE_H */
--- a/src/vehicle.cpp Tue Dec 18 20:38:16 2007 +0000
+++ b/src/vehicle.cpp Tue Dec 18 20:58:12 2007 +0000
@@ -28,7 +28,7 @@
#include "vehicle_gui.h"
#include "depot.h"
#include "station.h"
-#include "rail.h"
+#include "rail_type.h"
#include "train.h"
#include "aircraft.h"
#include "industry_map.h"