(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.

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"

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"

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"

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 {

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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)
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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? */

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"

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"
 

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 {

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"

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"

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);

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"

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"

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"

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"

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"

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"

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"

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"

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"