(svn r11774) -Change: do not include variables.h in a header when it is not needed.

projects/openttd.vcproj

@@ -884,6 +884,9 @@
 			<File
 				RelativePath=".\..\src\station_cmd.cpp">
 			</File>
+			<File
+				RelativePath=".\..\src\terraform_cmd.cpp">
+			</File>
 			<File
 				RelativePath=".\..\src\timetable_cmd.cpp">
 			</File>

projects/openttd_vs80.vcproj

@@ -1407,6 +1407,10 @@
 				RelativePath=".\..\src\station_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\terraform_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable_cmd.cpp"
 				>

projects/openttd_vs90.vcproj

@@ -1404,6 +1404,10 @@
 				RelativePath=".\..\src\station_cmd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\terraform_cmd.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\timetable_cmd.cpp"
 				>

source.list

@@ -262,6 +262,7 @@ road_cmd.cpp
 roadveh_cmd.cpp
 ship_cmd.cpp
 station_cmd.cpp
+terraform_cmd.cpp
 timetable_cmd.cpp
 town_cmd.cpp
 train_cmd.cpp

src/ai/ai.h

@@ -7,6 +7,7 @@
 #include "../player.h"
 #include "../command_type.h"
 #include "../core/random_func.hpp"
+#include "../settings_type.h"
 
 /* How DoCommands look like for an AI */
 struct AICommand {

src/ai/trolly/pathfinder.cpp

@@ -11,6 +11,7 @@
 #include "../../bridge.h"
 #include "../../tunnelbridge_map.h"
 #include "../ai.h"
+#include "../../variables.h"
 
 
 #define TEST_STATION_NO_DIR 0xFF

src/aircraft.h

@@ -8,7 +8,6 @@
 #include "station_map.h"
 #include "vehicle_base.h"
 #include "engine.h"
-#include "variables.h"
 
 /** An aircraft can be one ot those types */
 enum AircraftSubType {

src/aircraft_cmd.cpp

@@ -33,6 +33,7 @@
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "functions.h"
+#include "variables.h"
 
 void Aircraft::UpdateDeltaXY(Direction direction)
 {

src/airport_gui.cpp

@@ -17,6 +17,7 @@
 #include "depot.h"
 #include "sound_func.h"
 #include "window_func.h"
+#include "variables.h"
 
 static byte _selected_airport_type;
 

src/autoreplace_cmd.cpp

@@ -20,6 +20,7 @@
 #include "command_func.h"
 #include "vehicle_func.h"
 #include "functions.h"
+#include "variables.h"
 
 /*
  * move the cargo from one engine to another if possible

src/autoslope.h

@@ -6,6 +6,7 @@
 #define AUTOSLOPE_H
 
 #include "depot.h"
+#include "settings_type.h"
 
 /**
  * Autoslope check for tiles with an entrance on an edge.

src/build_vehicle_gui.cpp

@@ -29,6 +29,7 @@
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
+#include "settings_type.h"
 
 
 enum BuildVehicleWidgets {

src/depot.h

@@ -7,7 +7,6 @@
 
 #include "direction_type.h"
 #include "oldpool.h"
-#include "variables.h"
 #include "road_map.h"
 #include "rail_map.h"
 #include "water_map.h"
@@ -36,23 +35,6 @@ void ShowDepotWindow(TileIndex tile, VehicleType type);
 #define FOR_ALL_DEPOTS_FROM(d, start) for (d = GetDepot(start); d != NULL; d = (d->index + 1U < GetDepotPoolSize()) ? GetDepot(d->index + 1U) : NULL) if (d->IsValid())
 #define FOR_ALL_DEPOTS(d) FOR_ALL_DEPOTS_FROM(d, 0)
 
-#define MIN_SERVINT_PERCENT  5
-#define MAX_SERVINT_PERCENT 90
-#define MIN_SERVINT_DAYS    30
-#define MAX_SERVINT_DAYS   800
-
-/**
- * Get the service interval domain.
- * Get the new proposed service interval for the vehicle is indeed, clamped
- * within the given bounds. @see MIN_SERVINT_PERCENT ,etc.
- * @param index proposed service interval
- * @return service interval
- */
-static inline Date GetServiceIntervalClamped(uint index)
-{
-	return (_patches.servint_ispercent) ? Clamp(index, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(index, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS);
-}
-
 /**
  * Check if a tile is a depot of the given type.
  */

src/npf.cpp

@@ -21,6 +21,7 @@
 #include "tunnelbridge_map.h"
 #include "functions.h"
 #include "vehicle_base.h"
+#include "settings_type.h"
 
 static AyStar _npf_aystar;
 

src/oldloader.cpp

@@ -24,6 +24,7 @@
 #include "functions.h"
 #include "date_func.h"
 #include "vehicle_func.h"
+#include "variables.h"
 
 enum {
 	HEADER_SIZE = 49,

src/openttd.cpp

@@ -63,6 +63,7 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
+#include "variables.h"
 
 #include "bridge_map.h"
 #include "clear_map.h"

src/order.h

@@ -10,6 +10,7 @@
 #include "cargo_type.h"
 #include "vehicle_type.h"
 #include "tile_type.h"
+#include "date_type.h"
 
 enum {
 	INVALID_VEH_ORDER_ID = 0xFF,
@@ -216,4 +217,18 @@ bool CheckForValidOrders(const Vehicle* v);
 
 Order UnpackOldOrder(uint16 packed);
 
+#define MIN_SERVINT_PERCENT  5
+#define MAX_SERVINT_PERCENT 90
+#define MIN_SERVINT_DAYS    30
+#define MAX_SERVINT_DAYS   800
+
+/**
+ * Get the service interval domain.
+ * Get the new proposed service interval for the vehicle is indeed, clamped
+ * within the given bounds. @see MIN_SERVINT_PERCENT ,etc.
+ * @param index proposed service interval
+ * @return service interval
+ */
+Date GetServiceIntervalClamped(uint index);
+
 #endif /* ORDER_H */

src/order_cmd.cpp

@@ -21,6 +21,7 @@
 #include "core/alloc_func.hpp"
 #include "functions.h"
 #include "window_func.h"
+#include "settings_type.h"
 
 DEFINE_OLD_POOL_GENERIC(Order, Order)
 
@@ -1251,6 +1252,11 @@ void DeleteVehicleOrders(Vehicle *v)
 	}
 }
 
+Date GetServiceIntervalClamped(uint index)
+{
+	return (_patches.servint_ispercent) ? Clamp(index, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : Clamp(index, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS);
+}
+
 /**
  *
  * Check if we share our orders with an other vehicle

src/order_gui.cpp

@@ -25,6 +25,7 @@
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
+#include "settings_type.h"
 
 enum OrderWindowWidgets {
 	ORDER_WIDGET_CLOSEBOX = 0,

src/rail.h

@@ -11,7 +11,6 @@
 #include "gfx_type.h"
 #include "core/bitmath_func.hpp"
 #include "economy_func.h"
-#include "variables.h"
 #include "tile_cmd.h"
 
 /** This struct contains all the info that is needed to draw and construct tracks.

src/rail_cmd.cpp

@@ -34,6 +34,7 @@
 #include "newgrf_station.h"
 #include "train.h"
 #include "misc/autoptr.hpp"
+#include "variables.h"
 #include "autoslope.h"
 #include "transparency.h"
 #include "water.h"

src/road_cmd.cpp

@@ -26,6 +26,7 @@
 #include "station_map.h"
 #include "tunnel_map.h"
 #include "misc/autoptr.hpp"
+#include "variables.h"
 #include "autoslope.h"
 #include "transparency.h"
 #include "tunnelbridge_map.h"

src/roadveh.h

@@ -7,7 +7,6 @@
 
 #include "vehicle_base.h"
 #include "engine.h"
-#include "variables.h"
 #include "economy_func.h"
 
 enum RoadVehicleSubType {

src/roadveh_cmd.cpp

@@ -38,6 +38,7 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
+#include "variables.h"
 
 
 static const uint16 _roadveh_images[63] = {

src/ship.h

@@ -7,7 +7,6 @@
 
 #include "vehicle_base.h"
 #include "engine.h"
-#include "variables.h"
 #include "economy_func.h"
 
 void CcBuildShip(bool success, TileIndex tile, uint32 p1, uint32 p2);

src/ship_cmd.cpp

@@ -34,6 +34,8 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
+#include "variables.h"
+
 
 static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
 

src/station.cpp

@@ -31,6 +31,7 @@
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
+#include "variables.h"
 
 Station::Station(TileIndex tile)
 {

src/station_cmd.cpp

@@ -35,6 +35,7 @@
 #include "road_type.h"
 #include "road_internal.h" /* For drawing catenary/checking road removal */
 #include "cargotype.h"
+#include "variables.h"
 #include "autoslope.h"
 #include "transparency.h"
 #include "water.h"

src/train_cmd.cpp

@@ -43,6 +43,7 @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
+#include "variables.h"
 
 
 static bool TrainCheckIfLineEnds(Vehicle *v);

src/train_gui.cpp

@@ -17,6 +17,7 @@
 #include "newgrf_engine.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
+#include "settings_type.h"
 
 void CcBuildWagon(bool success, TileIndex tile, uint32 p1, uint32 p2)
 {

src/vehicle.cpp

@@ -43,6 +43,7 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
+#include "variables.h"
 
 #define INVALID_COORD (0x7fffffff)
 #define GEN_HASH(x, y) ((GB((y), 6, 6) << 6) + GB((x), 7, 6))

src/water_cmd.cpp

@@ -32,6 +32,7 @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
+#include "variables.h"
 
 
 static Vehicle *FindFloodableVehicleOnTile(TileIndex tile);

src/yapf/yapf.hpp

@@ -22,8 +22,8 @@
 #include "../pathfind.h"
 #include "../waypoint.h"
 #include "../debug.h"
+#include "../settings_type.h"
 
-extern Patches _patches_newgame;
 extern uint64 _rdtsc();
 
 #include <limits.h>