summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-01-09 00:59:02 +0000
committerrubidium <rubidium@openttd.org>2008-01-09 00:59:02 +0000
commitcd92981e9f4cff3560e4c2b2dfe8405e3d4b67c4 (patch)
treeb94296a5398931c954ae3ac568d683adee6930e0 /src
parentce2104ed4783138596dfc56a0829222fccdf5b34 (diff)
downloadopenttd-cd92981e9f4cff3560e4c2b2dfe8405e3d4b67c4.tar.xz
(svn r11785) -Codechange: remove some unneeded includes.
Diffstat (limited to 'src')
-rw-r--r--src/bridge.h1
-rw-r--r--src/build_vehicle_gui.cpp16
-rw-r--r--src/window_gui.h20
3 files changed, 18 insertions, 19 deletions
diff --git a/src/bridge.h b/src/bridge.h
index 23772c98e..9ed6c559e 100644
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -6,6 +6,7 @@
#define BRIDGE_H
#include "gfx_type.h"
+#include "direction_type.h"
#include "tile_cmd.h"
enum {
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index e2799f772..4580799e1 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -31,6 +31,22 @@
#include "vehicle_func.h"
#include "settings_type.h"
+struct buildvehicle_d {
+ VehicleType vehicle_type;
+ union {
+ RailTypeByte railtype;
+ AirportFTAClass::Flags flags;
+ RoadTypes roadtypes;
+ } filter;
+ byte sel_index; ///< deprecated value, used for 'unified' ship and road
+ bool descending_sort_order;
+ byte sort_criteria;
+ bool regenerate_list;
+ EngineID sel_engine;
+ EngineID rename_engine;
+ EngineList eng_list;
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(buildvehicle_d));
enum BuildVehicleWidgets {
BUILD_VEHICLE_WIDGET_CLOSEBOX = 0,
diff --git a/src/window_gui.h b/src/window_gui.h
index fb8d70761..2c0619502 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -5,10 +5,9 @@
#ifndef WINDOW_GUI_H
#define WINDOW_GUI_H
-#include "order.h"
+#include "core/bitmath_func.hpp"
#include "rail_type.h"
#include "road_type.h"
-#include "airport.h"
#include "vehicle_type.h"
#include "viewport.h"
@@ -327,23 +326,6 @@ struct tooltips_d {
};
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(tooltips_d));
-struct buildvehicle_d {
- VehicleType vehicle_type;
- union {
- RailTypeByte railtype;
- AirportFTAClass::Flags flags;
- RoadTypes roadtypes;
- } filter;
- byte sel_index; ///< deprecated value, used for 'unified' ship and road
- bool descending_sort_order;
- byte sort_criteria;
- bool regenerate_list;
- EngineID sel_engine;
- EngineID rename_engine;
- EngineList eng_list;
-};
-assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(buildvehicle_d));
-
struct replaceveh_d {
byte sel_index[2];
EngineID sel_engine[2];