(svn r12490) -Codechange: rename engine.h to engine_func.h and remove unneeded inclusions of engine.h and/or replace them with engine_type.h.

46 files changed, 29 insertions, 41 deletions

diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp
index 62829b4e0..5100f3337 100644
--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -11,7 +11,6 @@
 #include "../../roadveh.h"
 #include "../../station_map.h"
 #include "../../tunnel_map.h"
-#include "../../engine.h"
 #include "../../command_func.h"
 #include "../../town.h"
 #include "../../industry.h"
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp
index 109b937aa..b46984d0a 100644
--- a/src/ai/trolly/build.cpp
+++ b/src/ai/trolly/build.cpp
@@ -6,7 +6,7 @@
 #include "../../road_map.h"
 #include "../../command_func.h"
 #include "trolly.h"
-#include "../../engine.h"
+#include "../../engine_func.h"
 #include "../../variables.h"
 #include "../../bridge.h"
 #include "../../vehicle_func.h"
diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp
index 0d176dc14..0860c43b0 100644
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -27,7 +27,7 @@
 #include "../../town.h"
 #include "../../industry.h"
 #include "../../station_base.h"
-#include "../../engine.h"
+#include "../../engine_func.h"
 #include "../../gui.h"
 #include "../../depot.h"
 #include "../../vehicle_base.h"
diff --git a/src/aircraft.h b/src/aircraft.h
index 0012878b6..2f05aada2 100644
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -8,7 +8,7 @@
 #include "station_map.h"
 #include "station_base.h"
 #include "vehicle_base.h"
-#include "engine.h"
+#include "engine_func.h"
 
 /** An aircraft can be one ot those types */
 enum AircraftSubType {
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 22e04b0a0..25be72919 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -11,7 +11,6 @@
 #include "station_map.h"
 #include "timetable.h"
 #include "depot.h"
-#include "engine.h"
 #include "news_func.h"
 #include "aircraft.h"
 #include "airport.h"
diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp
index d2c7ae0a2..bf445b8ee 100644
--- a/src/aircraft_gui.cpp
+++ b/src/aircraft_gui.cpp
@@ -7,7 +7,6 @@
 #include "aircraft.h"
 #include "debug.h"
 #include "gui.h"
-#include "engine.h"
 #include "depot.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index c4947bc3b..1f943b104 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -5,7 +5,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "articulated_vehicles.h"
-#include "engine.h"
 #include "train.h"
 #include "roadveh.h"
 #include "newgrf_callbacks.h"
diff --git a/src/autoreplace_cmd.cpp b/src/autoreplace_cmd.cpp
index 74f476669..59dcbddc9 100644
--- a/src/autoreplace_cmd.cpp
+++ b/src/autoreplace_cmd.cpp
@@ -6,7 +6,6 @@
 #include "ship.h"
 #include "news_func.h"
 #include "player_func.h"
-#include "engine.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "depot.h"
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 9c6eb3466..f6cb4799f 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -19,6 +19,7 @@
 #include "gfx_func.h"
 #include "player_func.h"
 #include "widgets/dropdown_func.h"
+#include "engine_func.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 396c85587..58114c221 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -13,7 +13,6 @@
 #include "articulated_vehicles.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "engine.h"
 #include "player_func.h"
 #include "depot.h"
 #include "airport.h"
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index c18d2f6df..47e6d9212 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -6,7 +6,7 @@
 #include "openttd.h"
 #include "console.h"
 #include "debug.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "landscape.h"
 #include "saveload.h"
 #include "variables.h"
@@ -18,7 +18,6 @@
 #include "settings_func.h"
 #include "fios.h"
 #include "fileio.h"
-#include "station.h"
 #include "screenshot.h"
 #include "genworld.h"
 #include "network/network.h"
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index d4e883674..18e4a053f 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "tile_map.h"
-#include "station.h"
+#include "station_type.h"
 #include "gui.h"
 #include "terraform_gui.h"
 #include "window_gui.h"
diff --git a/src/economy.cpp b/src/economy.cpp
index 9a7203af0..0544f2b68 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -14,7 +14,6 @@
 #include "town.h"
 #include "news_func.h"
 #include "network/network.h"
-#include "engine.h"
 #include "network/network_data.h"
 #include "variables.h"
 #include "vehicle_gui.h"
diff --git a/src/elrail.cpp b/src/elrail.cpp
index c14908564..c126b80dc 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -65,6 +65,7 @@
 #include "vehicle_func.h"
 #include "player_base.h"
 #include "tunnelbridge.h"
+#include "engine_func.h"
 
 #include "table/sprites.h"
 #include "table/elrail_data.h"
diff --git a/src/engine.cpp b/src/engine.cpp
index 7f2c77054..01b1fec47 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -5,7 +5,6 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
-#include "engine.h"
 #include "player_base.h"
 #include "player_func.h"
 #include "command_func.h"
diff --git a/src/engine.h b/src/engine_func.h
index 7b5cac1d5..7b5cac1d5 100644
--- a/src/engine.h
+++ b/src/engine_func.h
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 4611e700c..cf0b83f7f 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -7,7 +7,7 @@
 #include "gui.h"
 #include "window_gui.h"
 #include "gfx_func.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "command_func.h"
 #include "economy_func.h"
 #include "news_func.h"
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 08768e024..885e5171e 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -21,7 +21,7 @@
 #include "map_func.h"
 #include "date_func.h"
 #include "core/random_func.hpp"
-#include "engine.h"
+#include "engine_func.h"
 #include "settings_type.h"
 #include "newgrf_storage.h"
 #include "water.h"
diff --git a/src/group.h b/src/group.h
index da6ec7f2a..7bac2b48f 100644
--- a/src/group.h
+++ b/src/group.h
@@ -9,7 +9,7 @@
 #include "oldpool.h"
 #include "player_type.h"
 #include "vehicle_type.h"
-#include "engine.h"
+#include "engine_type.h"
 
 DECLARE_OLD_POOL(Group, Group, 5, 2047)
 
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 667dcaea9..85ca3ea14 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -8,7 +8,6 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "engine.h"
 #include "vehicle_gui.h"
 #include "depot.h"
 #include "train.h"
diff --git a/src/helpers.cpp b/src/helpers.cpp
index 4caf7927f..4f55cc272 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 
 #include "openttd.h"
-#include "engine.h"
+#include "engine_func.h"
 
 #include <new>
 #include "misc/blob.hpp"
diff --git a/src/misc.cpp b/src/misc.cpp
index 80fb667f0..b13200522 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -8,7 +8,6 @@
 #include "landscape.h"
 #include "news_func.h"
 #include "saveload.h"
-#include "engine.h"
 #include "vehicle_gui.h"
 #include "variables.h"
 #include "ai/ai.h"
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index dde16e732..088333530 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -9,7 +9,7 @@
 #include "openttd.h"
 #include "debug.h"
 #include "fileio.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "spritecache.h"
 #include "sprite.h"
 #include "newgrf.h"
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index d455552c9..efb380f49 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -6,7 +6,7 @@
 #include "openttd.h"
 #include "variables.h"
 #include "debug.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "train.h"
 #include "player_func.h"
 #include "player_base.h"
diff --git a/src/newgrf_sound.cpp b/src/newgrf_sound.cpp
index 80b4d6060..6c017b377 100644
--- a/src/newgrf_sound.cpp
+++ b/src/newgrf_sound.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "oldpool.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
diff --git a/src/newgrf_station.h b/src/newgrf_station.h
index ff5d82ab0..6cf164a35 100644
--- a/src/newgrf_station.h
+++ b/src/newgrf_station.h
@@ -5,7 +5,7 @@
 #ifndef NEWGRF_STATION_H
 #define NEWGRF_STATION_H
 
-#include "engine.h"
+#include "engine_type.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_cargo.h"
 #include "tile_type.h"
diff --git a/src/oldloader.cpp b/src/oldloader.cpp
index 1d7008c17..a5bf88f71 100644
--- a/src/oldloader.cpp
+++ b/src/oldloader.cpp
@@ -9,7 +9,6 @@
 #include "industry.h"
 #include "player_func.h"
 #include "player_base.h"
-#include "engine.h"
 #include "aircraft.h"
 #include "roadveh.h"
 #include "ship.h"
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 70e2a1b51..f11e10f7d 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -28,7 +28,6 @@
 #include "town.h"
 #include "industry.h"
 #include "news_func.h"
-#include "engine.h"
 #include "fileio.h"
 #include "fios.h"
 #include "airport.h"
diff --git a/src/player_base.h b/src/player_base.h
index 43e6460eb..52c96f765 100644
--- a/src/player_base.h
+++ b/src/player_base.h
@@ -8,7 +8,7 @@
 #include "road_type.h"
 #include "rail_type.h"
 #include "date_type.h"
-#include "engine.h"
+#include "engine_type.h"
 #include "livery.h"
 #include "autoreplace_type.h"
 #include "economy_type.h"
diff --git a/src/players.cpp b/src/players.cpp
index 85a5ef5d0..bb2fff810 100644
--- a/src/players.cpp
+++ b/src/players.cpp
@@ -4,7 +4,7 @@
  */
 #include "stdafx.h"
 #include "openttd.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "player_func.h"
 #include "player_gui.h"
 #include "town.h"
@@ -14,7 +14,6 @@
 #include "network/network.h"
 #include "network/network_internal.h"
 #include "variables.h"
-#include "engine.h"
 #include "ai/ai.h"
 #include "player_face.h"
 #include "group.h"
diff --git a/src/rail.cpp b/src/rail.cpp
index aeda9ab98..fe799f09d 100644
--- a/src/rail.cpp
+++ b/src/rail.cpp
@@ -13,6 +13,7 @@
 #include "date_func.h"
 #include "player_func.h"
 #include "player_base.h"
+#include "engine_func.h"
 
 
 /* XXX: Below 3 tables store duplicate data. Maybe remove some? */
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 2828bfafe..8e1e0ba5d 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -17,7 +17,7 @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "pathfind.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "town.h"
 #include "sprite.h"
 #include "depot.h"
diff --git a/src/road.cpp b/src/road.cpp
index 2a7241af1..e96e79358 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -9,7 +9,7 @@
 #include "genworld.h"
 #include "player_func.h"
 #include "player_base.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "settings_type.h"
 #include "date_func.h"
 
diff --git a/src/roadveh.h b/src/roadveh.h
index fa6df94eb..60e6d5a9d 100644
--- a/src/roadveh.h
+++ b/src/roadveh.h
@@ -6,7 +6,7 @@
 #define ROADVEH_H
 
 #include "vehicle_base.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "economy_func.h"
 
 enum RoadVehicleSubType {
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 9be636077..2314a9aa1 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -11,7 +11,6 @@
 #include "roadveh.h"
 #include "station_map.h"
 #include "timetable.h"
-#include "engine.h"
 #include "command_func.h"
 #include "station_base.h"
 #include "news_func.h"
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index ca2592a19..e1d9ef4bc 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -9,7 +9,7 @@
 #include "window_gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "screenshot.h"
 #include "newgrf.h"
 #include "network/network.h"
diff --git a/src/ship.h b/src/ship.h
index 2d96cbe1d..2a90ed0b4 100644
--- a/src/ship.h
+++ b/src/ship.h
@@ -6,7 +6,7 @@
 #define SHIP_H
 
 #include "vehicle_base.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "economy_func.h"
 
 void CcBuildShip(bool success, TileIndex tile, uint32 p1, uint32 p2);
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index d9147c4ce..ae7bea8b4 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -13,7 +13,7 @@
 #include "station_map.h"
 #include "station_base.h"
 #include "news_func.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "player_func.h"
 #include "player_base.h"
 #include "npf.h"
diff --git a/src/strings.cpp b/src/strings.cpp
index b2d0d0b82..62e822438 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -36,6 +36,7 @@
 #include "fios.h"
 #include "settings_type.h"
 #include "video/video_driver.hpp"
+#include "engine_func.h"
 
 #include "table/strings.h"
 #include "table/control_codes.h"
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 3a28abc40..935f39afc 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -17,7 +17,7 @@
 #include "variables.h"
 #include "functions.h"
 #include "sound_func.h"
-#include "station.h"
+#include "station_base.h"
 #include "unmovable_map.h"
 #include "textbuf_gui.h"
 #include "genworld.h"
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 85db9f1d1..887929b69 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -6,7 +6,6 @@
 #include "openttd.h"
 #include "variables.h"
 #include "command_func.h"
-#include "engine.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 9700048a9..826861fe4 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -18,7 +18,7 @@
 #include "npf.h"
 #include "station_base.h"
 #include "news_func.h"
-#include "engine.h"
+#include "engine_func.h"
 #include "player_func.h"
 #include "player_base.h"
 #include "depot.h"
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index 6f42a66dc..fd46a10bb 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -17,6 +17,7 @@
 #include "vehicle_func.h"
 #include "settings_type.h"
 #include "order_func.h"
+#include "engine_func.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index b65be5fb6..0260798ed 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -34,6 +34,7 @@
 #include "signal_func.h"
 #include "tunnelbridge.h"
 #include "player_base.h"
+#include "engine_func.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 6d2d18988..349ef1b5b 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -17,7 +17,6 @@
 #include "command_func.h"
 #include "saveload.h"
 #include "player_func.h"
-#include "engine.h"
 #include "debug.h"
 #include "vehicle_gui.h"
 #include "depot.h"
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index e217ecd0b..25cd8c81b 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -6,7 +6,6 @@
 #include "openttd.h"
 #include "debug.h"
 #include "player_func.h"
-#include "engine.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "textbuf_gui.h"