# HG changeset patch # User rubidium # Date 1199840342 0 # Node ID ce045772929516055270a90267bf1e092f57bb95 # Parent 59791d0e0c04eea3ee51e71d82510c4272d4ff6e (svn r11785) -Codechange: remove some unneeded includes. diff -r 59791d0e0c04 -r ce0457729295 src/bridge.h --- a/src/bridge.h Tue Jan 08 18:25:51 2008 +0000 +++ b/src/bridge.h Wed Jan 09 00:59:02 2008 +0000 @@ -6,6 +6,7 @@ #define BRIDGE_H #include "gfx_type.h" +#include "direction_type.h" #include "tile_cmd.h" enum { diff -r 59791d0e0c04 -r ce0457729295 src/build_vehicle_gui.cpp --- a/src/build_vehicle_gui.cpp Tue Jan 08 18:25:51 2008 +0000 +++ b/src/build_vehicle_gui.cpp Wed Jan 09 00:59:02 2008 +0000 @@ -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 -r 59791d0e0c04 -r ce0457729295 src/window_gui.h --- a/src/window_gui.h Tue Jan 08 18:25:51 2008 +0000 +++ b/src/window_gui.h Wed Jan 09 00:59:02 2008 +0000 @@ -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 @@ }; 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];