cpp/openttd-patchpack/source Changeset - r15934:789c54d0000d

Changeset - r15934:789c54d0000d

Parent rev.

Child rev.

[Not reviewed]

master

! ! !

rubidium - 14 years ago 2010-08-26 22:01:16
rubidium@openttd.org

(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers

135 files changed with 42 insertions and 263 deletions:

src/ai/ai_core.cpp

src/ai/ai_gui.cpp

src/ai/ai_info.cpp

src/ai/ai_instance.cpp

src/ai/ai_scanner.cpp

src/ai/api/ai_basestation.cpp

src/ai/api/ai_gamesettings.cpp

src/ai/api/ai_industrytype.cpp

src/ai/api/ai_marine.cpp

src/ai/api/ai_object.cpp

src/ai/api/ai_rail.cpp

src/ai/api/ai_road.cpp

src/ai/api/ai_town.cpp

src/ai/api/ai_vehicle.cpp

src/aircraft_cmd.cpp

src/aircraft_gui.cpp

src/airport.cpp

src/airport_gui.cpp

src/articulated_vehicles.cpp

src/autoreplace_cmd.cpp

src/bridge_gui.cpp

src/build_vehicle_gui.cpp

src/command.cpp

src/company_cmd.cpp

src/company_gui.cpp

src/console_cmds.cpp

src/date.cpp

src/depot_gui.cpp

src/disaster_cmd.cpp

src/dock_gui.cpp

src/economy.cpp

src/elrail.cpp

src/fios.cpp

src/fios.h

src/gamelog.cpp

src/genworld.cpp

src/genworld_gui.cpp

src/gfx.cpp

src/gfxinit.cpp

src/ground_vehicle.cpp

src/group_cmd.cpp

src/group_gui.cpp

src/hotkeys.cpp

src/industry_cmd.cpp

src/industry_gui.cpp

src/intro_gui.cpp

src/map.cpp

src/misc/binaryheap.hpp

src/misc/hashtable.hpp

src/misc_gui.cpp

src/network/core/tcp_http.cpp

src/network/core/tcp_http.h

src/network/network_gui.cpp

src/newgrf.cpp

src/newgrf_airport.cpp

src/newgrf_airport.h

src/newgrf_airporttiles.cpp

src/newgrf_animation_base.h

src/newgrf_canal.cpp

src/newgrf_class_func.h

src/newgrf_commons.cpp

src/newgrf_commons.h

src/newgrf_config.cpp

src/newgrf_debug_gui.cpp

src/newgrf_engine.cpp

src/newgrf_house.cpp

src/newgrf_industries.cpp

src/newgrf_industries.h

src/newgrf_industrytiles.cpp

src/newgrf_railtype.cpp

src/newgrf_spritegroup.cpp

src/newgrf_spritegroup.h

src/newgrf_station.cpp

src/object_cmd.cpp

src/object_map.h

src/openttd.cpp

src/order_backup.cpp

src/order_backup.h

src/order_gui.cpp

src/pathfinder/npf/npf.cpp

src/pathfinder/yapf/yapf.h

src/rail_cmd.cpp

src/rail_gui.cpp

src/rail_gui.h

src/road_cmd.cpp

src/road_gui.cpp

src/road_gui.h

src/roadstop.cpp

src/roadveh.h

src/roadveh_cmd.cpp

src/saveload/afterload.cpp

src/saveload/company_sl.cpp

src/saveload/gamelog_sl.cpp

src/saveload/map_sl.cpp

src/saveload/misc_sl.cpp

src/saveload/newgrf_sl.cpp

src/saveload/oldloader_sl.cpp

src/saveload/saveload.cpp

src/saveload/vehicle_sl.cpp

src/script/script_info.cpp

src/script/script_scanner.cpp

src/script/squirrel.cpp

src/script/squirrel.hpp

src/script/squirrel_class.hpp

src/script/squirrel_helper.hpp

src/script/squirrel_std.cpp

src/script/squirrel_std.hpp

src/settings.cpp

src/settings_gui.cpp

src/ship_cmd.cpp

src/signal_type.h

src/smallmap_gui.cpp

src/sprite.cpp

src/sprite.h

src/station_base.h

src/station_cmd.cpp

src/station_gui.cpp

src/strings.cpp

src/terraform_gui.cpp

src/tile_map.cpp

src/tilearea.cpp

src/toolbar_gui.cpp

src/town_cmd.cpp

src/train_cmd.cpp

src/train_gui.cpp

src/transport_type.h

src/tunnelbridge_cmd.cpp

src/vehicle.cpp

src/vehicle_cmd.cpp

src/vehicle_gui.cpp

src/viewport.cpp

src/water_cmd.cpp

src/water_map.h

src/widget_type.h

src/window_gui.h

0 comments (0 inline, 0 general)

src/ai/ai_core.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
 #include "../stdafx.h"
 #include "../core/backup_type.hpp"
 #include "../core/bitmath_func.hpp"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../debug.h"
 #include "../network/network.h"
 #include "../window_func.h"
 #include "../command_func.h"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -10,23 +10,21 @@ @@
 /** @file ai_gui.cpp Window for configuring the AIs */
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "../table/sprites.h"
 #include "../gui.h"
 #include "../window_gui.h"
 #include "../querystring_gui.h"
 #include "../company_func.h"
 #include "../company_base.h"
 #include "../company_gui.h"
 #include "../strings_func.h"
 #include "../window_func.h"
 #include "../gfx_func.h"
 #include "../command_func.h"
 #include "../network/network.h"
 #include "../textbuf_gui.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
 #include "../core/backup_type.hpp"
 #include "ai.hpp"
 #include "api/ai_log.hpp"

src/ai/ai_info.cpp

➞

Show inline comments

@@ @@ -8,14 +8,12 @@ @@
  */
 /** @file ai_info.cpp Implementation of AIFileInfo */
 #include "../stdafx.h"
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "../settings_type.h"
 #include "../openttd.h"
 #include "../debug.h"

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -11,15 +11,12 @@ @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../saveload/saveload.h"
 #include "../gui.h"
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "ai_config.hpp"
 #include "ai_storage.hpp"
 #include "ai_instance.hpp"
 #include "ai_gui.hpp"

src/ai/ai_scanner.cpp

➞

Show inline comments

@@ @@ -12,15 +12,12 @@ @@
 #include "../stdafx.h"
 #include "../debug.h"
 #include "../fileio_func.h"
 #include "../network/network.h"
 #include "../core/random_func.hpp"
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "../script/squirrel_helper.hpp"
 #include "../script/squirrel_class.hpp"
 #include "ai_info.hpp"
 #include "ai_scanner.hpp"
 #include "api/ai_controller.hpp"
 void AIScanner::RescanAIDir()

src/ai/api/ai_basestation.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file ai_basestation.cpp Implementation of AIBaseStation. */
 #include "ai_basestation.hpp"
 #include "../../station_base.h"
 #include "../../command_func.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
 #include "table/strings.h"
 /* static */ bool AIBaseStation::IsValidBaseStation(StationID station_id)

src/ai/api/ai_gamesettings.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file ai_gamesettings.cpp Implementation of AIGameSettings. */
 #include "ai_gamesettings.hpp"
 #include "../../settings_internal.h"
 #include "../../economy_func.h"
 /* static */ bool AIGameSettings::IsValid(const char *setting)
+{
 	uint i;
 	const SettingDesc *sd = GetSettingFromName(setting, &i);
 	return sd != NULL && sd->desc.cmd != SDT_STRING;

src/ai/api/ai_industrytype.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file ai_industrytype.cpp Implementation of AIIndustryType. */
 #include "ai_industrytype.hpp"
 #include "ai_map.hpp"
 #include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../industry.h"
 #include "../../newgrf_industries.h"
 #include "../../core/random_func.hpp"
 /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)

src/ai/api/ai_marine.cpp

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file ai_marine.cpp Implementation of AIMarine. */
 #include "ai_marine.hpp"
 #include "ai_station.hpp"
 #include "../../station_base.h"
 #include "../../tile_cmd.h"
 #include "../../economy_func.h"
 /* static */ bool AIMarine::IsWaterDepotTile(TileIndex tile)
+{
 	if (!::IsValidTile(tile)) return false;

src/ai/api/ai_object.cpp

➞

Show inline comments

@@ @@ -7,13 +7,12 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file ai_object.cpp Implementation of AIObject. */
 #include "../../stdafx.h"
 #include <squirrel.h>
 #include "../../script/squirrel.hpp"
 #include "../../company_base.h"
 #include "../ai_storage.hpp"
 #include "../ai_instance.hpp"
 #include "ai_error.hpp"

src/ai/api/ai_rail.cpp

➞

Show inline comments

@@ @@ -10,20 +10,18 @@ @@
 /** @file ai_rail.cpp Implementation of AIRail. */
 #include "ai_rail.hpp"
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_industrytype.hpp"
 #include "../../command_type.h"
 #include "../../debug.h"
 #include "../../station_base.h"
 #include "../../company_func.h"
 #include "../../newgrf.h"
 #include "../../newgrf_generic.h"
 #include "../../newgrf_station.h"
 #include "../../economy_func.h"
 /* static */ bool AIRail::IsRailTile(TileIndex tile)
+{
 	if (!::IsValidTile(tile)) return false;
 	return (::IsTileType(tile, MP_RAILWAY) && !::IsRailDepot(tile)) ||

src/ai/api/ai_road.cpp

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file ai_road.cpp Implementation of AIRoad. */
 #include "ai_map.hpp"
 #include "ai_station.hpp"
 #include "ai_cargo.hpp"
 #include "../../station_base.h"
 #include "../../command_type.h"
 #include "../../company_func.h"
 #include "../../script/squirrel_helper_type.hpp"
 /* static */ AIRoad::RoadVehicleType AIRoad::GetRoadVehicleTypeForCargo(CargoID cargo_type)
+{
 	return AICargo::HasCargoClass(cargo_type, AICargo::CC_PASSENGERS) ? ROADVEHTYPE_BUS : ROADVEHTYPE_TRUCK;

src/ai/api/ai_town.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
 #include "ai_town.hpp"
 #include "ai_map.hpp"
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
 #include "../../town.h"
 #include "../../town_type.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
 #include "../../station_base.h"
 #include "table/strings.h"
 /* static */ int32 AITown::GetTownCount()

src/ai/api/ai_vehicle.cpp

➞

Show inline comments

@@ @@ -12,20 +12,18 @@ @@
 #include "ai_engine.hpp"
 #include "ai_cargo.hpp"
 #include "ai_gamesettings.hpp"
 #include "ai_group.hpp"
 #include "../ai_instance.hpp"
 #include "../../company_func.h"
 #include "../../aircraft.h"
 #include "../../string_func.h"
 #include "../../strings_func.h"
 #include "../../command_func.h"
 #include "../../roadveh.h"
 #include "../../train.h"
 #include "../../vehicle_func.h"
 #include "../../engine_base.h"
 #include "table/strings.h"
 /* static */ bool AIVehicle::IsValidVehicle(VehicleID vehicle_id)
+{
 	const Vehicle *v = ::Vehicle::GetIfValid(vehicle_id);
 	return v != NULL && v->owner == _current_company && (v->IsPrimaryVehicle() || (v->type == VEH_TRAIN && ::Train::From(v)->IsFreeWagon()));

src/aircraft_cmd.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
  * @file aircraft_cmd.cpp
  * This file deals with aircraft and airport movements functionalities
  */
 #include "stdafx.h"
 #include "aircraft.h"
 #include "debug.h"
 #include "landscape.h"
 #include "news_func.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "spritecache.h"
@@ @@ -27,24 +26,21 @@ @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "functions.h"
 #include "cheat_type.h"
 #include "company_base.h"
 #include "autoreplace_gui.h"
 #include "ai/ai.hpp"
 #include "company_func.h"
 #include "effectvehicle_func.h"
 #include "station_base.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 #include "table/strings.h"
 #include "table/sprites.h"
 void Aircraft::UpdateDeltaXY(Direction direction)
+{
 	this->x_offs = -1;
 	this->y_offs = -1;
 	this->x_extent = 2;

src/aircraft_gui.cpp

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ @@
 #include "newgrf_engine.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "window_gui.h"
 #include "spritecache.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 /**
  * Draw the details for the given vehicle at the given position
+ *
  * @param v     current vehicle

src/airport.cpp

➞

Show inline comments

@@ @@ -7,19 +7,12 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file airport.cpp Functions related to airports. */
 #include "stdafx.h"
 #include "debug.h"
 #include "airport.h"
 #include "map_type.h"
 #include "core/alloc_func.hpp"
 #include "date_func.h"
 #include "settings_type.h"
 #include "newgrf_airport.h"
 #include "station_base.h"
 #include "table/strings.h"
 #include "table/airport_movement.h"
 #include "table/airporttile_ids.h"

src/airport_gui.cpp

➞

Show inline comments

@@ @@ -10,30 +10,27 @@ @@
 /** @file airport_gui.cpp The GUI for airports. */
 #include "stdafx.h"
 #include "window_gui.h"
 #include "station_gui.h"
 #include "terraform_gui.h"
 #include "airport.h"
 #include "sound_func.h"
 #include "window_func.h"
 #include "strings_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "company_func.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
 #include "station_type.h"
 #include "newgrf_airport.h"
 #include "newgrf_callbacks.h"
 #include "widgets/dropdown_type.h"
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "sprite.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 static AirportClassID _selected_airport_class; ///< the currently visible airport class
 static int _selected_airport_index;            ///< the index of the selected airport in the current class or -1
 static byte _selected_airport_layout;          ///< selected airport layout number.

src/articulated_vehicles.cpp

➞

Show inline comments

@@ @@ -9,15 +9,13 @@ @@
 /** @file articulated_vehicles.cpp Implementation of articulated vehicles. */
 #include "stdafx.h"
 #include "train.h"
 #include "roadveh.h"
 #include "newgrf_engine.h"
 #include "vehicle_func.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 static const uint MAX_ARTICULATED_PARTS = 100; ///< Maximum of articulated parts per vehicle, i.e. when to abort calling the articulated vehicle callback.

src/autoreplace_cmd.cpp

➞

Show inline comments

@@ @@ -9,15 +9,13 @@ @@
 /** @file autoreplace_cmd.cpp Deals with autoreplace execution but not the setup */
 #include "stdafx.h"
 #include "company_func.h"
 #include "train.h"
 #include "rail.h"
 #include "command_func.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "vehicle_func.h"
 #include "functions.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "group.h"

src/bridge_gui.cpp

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file bridge_gui.cpp Graphical user interface for bridge construction */
 #include "stdafx.h"
 #include "gui.h"
 #include "command_func.h"
 #include "economy_func.h"
 #include "bridge.h"
 #include "rail.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "sound_func.h"
 #include "gfx_func.h"

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -26,13 +26,12 @@ @@
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "widgets/dropdown_func.h"
 #include "engine_gui.h"
 #include "cargotype.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 /**
  * Get the height of a single 'entry' in the engine lists.
  * @param type the vehicle type to get the height of
  * @return the height for the entry

src/command.cpp

➞

Show inline comments

@@ @@ -20,13 +20,12 @@ @@
 #include "newgrf_storage.h"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "functions.h"
 #include "town.h"
 #include "date_func.h"
 #include "debug.h"
 #include "company_func.h"
 #include "company_base.h"
 #include "signal_func.h"
 #include "core/backup_type.hpp"
 #include "table/strings.h"

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ @@
 #include "network/network_func.h"
 #include "network/network_base.h"
 #include "ai/ai.hpp"
 #include "company_manager_face.h"
 #include "window_func.h"
 #include "strings_func.h"
 #include "gfx_func.h"
 #include "date_func.h"
 #include "sound_func.h"
 #include "rail.h"
 #include "core/pool_func.hpp"
 #include "settings_func.h"
 #include "vehicle_base.h"

src/company_gui.cpp

➞

Show inline comments

@@ @@ -16,24 +16,24 @@ @@
 #include "viewport_func.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "network/network.h"
 #include "network/network_gui.h"
 #include "network/network_func.h"
 #include "economy_func.h"
 #include "vehicle_func.h"
 #include "newgrf.h"
 #include "company_manager_face.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "widgets/dropdown_type.h"
 #include "tilehighlight_func.h"
 #include "sprite.h"
 #include "company_base.h"
 #include "core/geometry_func.hpp"
 #include "object.h"
 #include "economy_func.h"
 #include "object_type.h"
 #include "table/strings.h"
 /** Company GUI constants. */
 static const int FIRST_GUI_CALL = INT_MAX; ///< default value to specify this is the first call of the resizable gui

src/console_cmds.cpp

➞

Show inline comments

@@ @@ -27,13 +27,12 @@ @@
 #include "strings_func.h"
 #include "viewport_func.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
 #include "company_base.h"
 #include "gamelog.h"
 #include "ai/ai.hpp"
 #include "ai/ai_config.hpp"
 #include "newgrf.h"
 #include "console_func.h"

src/date.cpp

➞

Show inline comments

@@ @@ -14,13 +14,12 @@ @@
 #include "network/network_func.h"
 #include "currency.h"
 #include "window_func.h"
 #include "settings_type.h"
 #include "date_func.h"
 #include "vehicle_base.h"
 #include "debug.h"
 #include "rail_gui.h"
 #include "saveload/saveload.h"
 Year      _cur_year;   ///< Current year, starting at 0
 Month     _cur_month;  ///< Current month (0..11)
 Date      _date;       ///< Current date in days (day counter)

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -7,36 +7,33 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file depot_gui.cpp The GUI for depots. */
 #include "stdafx.h"
 #include "engine_base.h"
 #include "train.h"
 #include "ship.h"
 #include "aircraft.h"
 #include "roadveh.h"
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "depot_base.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "spritecache.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
 #include "tilehighlight_func.h"
 #include "window_gui.h"
 #include "vehiclelist.h"
 #include "order_backup.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 /*
  * Since all depot window sizes aren't the same, we need to modify sizes a little.
  * It's done with the following arrays of widget indexes. Each of them tells if a widget side should be moved and in what direction.
  * How long they should be moved and for what window types are controlled in ShowDepotWindow()
  */

src/disaster_cmd.cpp

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ @@
  *     will increase this value, and the last one will remove the disaster itself
  * </ol>
  */
 #include "stdafx.h"
 #include "landscape.h"
 #include "industry.h"
 #include "station_base.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "town.h"
@@ @@ -43,13 +42,12 @@ @@
 #include "ai/ai.hpp"
 #include "company_base.h"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 #include "table/strings.h"
 #include "table/sprites.h"
 /** Delay counter for considering the next disaster. */
 uint16 _disaster_delay;
 enum DisasterSubType {
 	ST_ZEPPELINER,

src/dock_gui.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file dock_gui.cpp GUI to create amazing water objects. */
 #include "stdafx.h"
 #include "openttd.h"
 #include "tile_map.h"
 #include "terraform_gui.h"
 #include "window_gui.h"
 #include "station_gui.h"
 #include "command_func.h"
 #include "water.h"
 #include "water_map.h"

src/economy.cpp

➞

Show inline comments

@@ @@ -19,13 +19,12 @@ @@
 #include "network/network_func.h"
 #include "vehicle_gui.h"
 #include "ai/ai.hpp"
 #include "aircraft.h"
 #include "train.h"
 #include "newgrf_cargo.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_station.h"
 #include "newgrf_airporttiles.h"
 #include "object.h"
@@ @@ -43,17 +42,15 @@ @@
 #include "subsidy_func.h"
 #include "station_base.h"
 #include "waypoint_base.h"
 #include "economy_base.h"
 #include "core/pool_func.hpp"
 #include "newgrf.h"
 #include "engine_base.h"
 #include "core/backup_type.hpp"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "table/pricebase.h"
 /* Initialize the cargo payment-pool */
 CargoPaymentPool _cargo_payment_pool("CargoPayment");
 INSTANTIATE_POOL_METHODS(CargoPayment)

src/elrail.cpp

➞

Show inline comments

@@ @@ -54,24 +54,20 @@ @@
+ *
  */
 #include "stdafx.h"
 #include "station_map.h"
 #include "viewport_func.h"
 #include "landscape.h"
 #include "train.h"
 #include "rail_gui.h"
 #include "tunnelbridge_map.h"
 #include "tunnelbridge.h"
 #include "elrail_func.h"
 #include "engine_base.h"
 #include "company_base.h"
 #include "rail.h"
 #include "newgrf_railtype.h"
 #include "table/sprites.h"
 #include "table/elrail_data.h"
 static inline TLG GetTLG(TileIndex t)
+{
 	return (TLG)((HasBit(TileX(t), 0) << 1) + HasBit(TileY(t), 0));
+}

src/fios.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
  * @file fios.cpp
  * This file contains functions for building file lists for the save/load dialogs.
  */
 #include "stdafx.h"
 #include "openttd.h"
 #include "core/sort_func.hpp"
 #include "fios.h"
 #include "fileio_func.h"
 #include "tar_type.h"
 #include "string_func.h"
 #include <sys/stat.h>

src/fios.h

➞

Show inline comments

@@ @@ -9,19 +9,13 @@ @@
 /** @file fios.h Declarations for savegames operations */
 #ifndef FIOS_H
 #define FIOS_H
 #include "strings_type.h"
 #include "core/smallvec_type.hpp"
 #include "core/smallmap_type.hpp"
 #include "core/enum_type.hpp"
 #include "gfx_type.h"
 #include "date_type.h"
 #include "settings_type.h"
 #include "company_base.h"
 #include "newgrf_config.h"
 typedef SmallMap<uint, CompanyProperties *> CompanyPropertiesMap;

src/gamelog.cpp

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file gamelog.cpp Definition of functions used for logging of important changes in the game */
 #include "stdafx.h"
 #include "openttd.h"
 #include "saveload/saveload.h"
 #include "core/alloc_func.hpp"
 #include "string_func.h"
 #include "settings_type.h"
 #include "gamelog_internal.h"
 #include "console_func.h"
 #include "debug.h"
 #include "date_func.h"

src/genworld.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "landscape.h"
 #include "company_func.h"
 #include "thread/thread.h"
 #include "command_func.h"
 #include "genworld.h"
 #include "gfxinit.h"
 #include "window_func.h"
 #include "network/network.h"
 #include "heightmap.h"
 #include "viewport_func.h"

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -12,13 +12,12 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "heightmap.h"
 #include "debug.h"
 #include "genworld.h"
 #include "network/network.h"
 #include "newgrf_config.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "sound_func.h"
 #include "fios.h"
 #include "string_func.h"

src/gfx.cpp

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ @@
 #include "genworld.h"
 #include "zoom_func.h"
 #include "blitter/factory.hpp"
 #include "video/video_driver.hpp"
 #include "strings_func.h"
 #include "settings_type.h"
 #include "landscape_type.h"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "thread/thread.h"
 #include "window_func.h"
 #include "newgrf_debug.h"

src/gfxinit.cpp

➞

Show inline comments

@@ @@ -12,13 +12,12 @@ @@
 #include "stdafx.h"
 #include "fios.h"
 #include "newgrf.h"
 #include "3rdparty/md5/md5.h"
 #include "fontcache.h"
 #include "gfx_func.h"
 #include "settings_type.h"
 /* The type of set we're replacing */
 #define SET_TYPE "graphics"
 #include "base_media_func.h"
 #include "table/sprites.h"

src/ground_vehicle.cpp

➞

Show inline comments

@@ @@ -9,14 +9,12 @@ @@
 /** @file ground_vehicle.cpp Implementation of GroundVehicle. */
 #include "stdafx.h"
 #include "train.h"
 #include "roadveh.h"
 #include "ground_vehicle.hpp"
 #include "window_type.h"
 #include "vehicle_gui.h"
 #include "window_func.h"
 /**
  * Recalculates the cached total power of a vehicle. Should be called when the consist is changed.
  */

src/group_cmd.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
 #include "stdafx.h"
 #include "cmd_helper.h"
 #include "command_func.h"
 #include "group.h"
 #include "train.h"
 #include "engine_base.h"
 #include "vehicle_gui.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_base.h"
 #include "autoreplace_func.h"
 #include "string_func.h"

src/group_gui.cpp

➞

Show inline comments

@@ @@ -18,13 +18,12 @@ @@
 #include "group.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_gui.h"
 #include "company_func.h"
 #include "widgets/dropdown_type.h"
 #include "widgets/dropdown_func.h"
 #include "tilehighlight_func.h"
 #include "vehicle_gui_base.h"
 #include "core/geometry_func.hpp"
 #include "company_base.h"

src/hotkeys.cpp

➞

Show inline comments

@@ @@ -11,15 +11,13 @@ @@
 #include "stdafx.h"
 #include "openttd.h"
 #include "hotkeys.h"
 #include "ini_type.h"
 #include "string_func.h"
 #include "gfx_type.h"
 #include "window_gui.h"
 #include <string.h>
 char *_hotkeys_file;
 /** String representation of a keycode */
 struct KeycodeNames {
 	const char *name;       ///< Name of the keycode

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -11,23 +11,20 @@ @@
 #include "stdafx.h"
 #include "clear_map.h"
 #include "industry.h"
 #include "station_base.h"
 #include "train.h"
 #include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
 #include "news_func.h"
 #include "cheat_type.h"
 #include "genworld.h"
 #include "tree_map.h"
 #include "newgrf.h"
 #include "newgrf_cargo.h"
 #include "newgrf_commons.h"
 #include "newgrf_debug.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "autoslope.h"
 #include "water.h"
 #include "strings_func.h"

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -18,13 +18,12 @@ @@
 #include "command_func.h"
 #include "viewport_func.h"
 #include "gfx_func.h"
 #include "industry.h"
 #include "town.h"
 #include "cheat_type.h"
 #include "newgrf.h"
 #include "newgrf_industries.h"
 #include "newgrf_text.h"
 #include "newgrf_debug.h"
 #include "strings_func.h"
 #include "company_func.h"
 #include "tilehighlight_func.h"

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -17,13 +17,12 @@ @@
 #include "network/network.h"
 #include "genworld.h"
 #include "network/network_gui.h"
 #include "network/network_content.h"
 #include "landscape_type.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "fios.h"
 #include "functions.h"
 #include "ai/ai_gui.hpp"
 #include "gfx_func.h"
 #include "core/geometry_func.hpp"

src/map.cpp

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file map.cpp Base functions related to the map and distances on them. */
 #include "stdafx.h"
 #include "debug.h"
 #include "core/alloc_func.hpp"
 #include "core/math_func.hpp"
 #include "tile_map.h"
 #if defined(_MSC_VER)
 /* Why the hell is that not in all MSVC headers?? */
 extern "C" _CRTIMP void __cdecl _assert(void *, void *, unsigned);
 #endif

src/misc/binaryheap.hpp

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file binaryheap.hpp Binary heap implementation. */
 #ifndef  BINARYHEAP_HPP
 #define  BINARYHEAP_HPP
 #include "../core/alloc_func.hpp"
 /* Enable it if you suspect binary heap doesn't work well */
 #define BINARYHEAP_CHECK 0
 #if BINARYHEAP_CHECK
 	#define CHECK_CONSISTY() this->CheckConsistency()
 #else

src/misc/hashtable.hpp

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file hashtable.hpp Hash table support. */
 #ifndef  HASHTABLE_HPP
 #define  HASHTABLE_HPP
 #include "../core/math_func.hpp"
 template <class Titem_>
 struct CHashTableSlotT
+{
 	typedef typename Titem_::Key Key;          // make Titem_::Key a property of HashTable
 	Titem_ *m_pFirst;

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -7,13 +7,12 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file misc_gui.cpp GUIs for a number of misc windows. */
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
 #include "landscape.h"
 #include "newgrf_text.h"
 #include "gui.h"
 #include "viewport_func.h"
 #include "gfx_func.h"

src/network/core/tcp_http.cpp

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ @@
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../rev.h"
 #include "../network_func.h"
 #include "tcp.h"
 #include "tcp_http.h"
 /** List of open HTTP connections. */
 static SmallVector<NetworkHTTPSocketHandler *, 1> _http_connections;
 NetworkHTTPSocketHandler::NetworkHTTPSocketHandler(SOCKET s,

src/network/core/tcp_http.h

➞

Show inline comments

@@ @@ -11,13 +11,13 @@ @@
  * @file tcp_http.h Basic functions to receive and send HTTP TCP packets.
  */
 #ifndef NETWORK_CORE_TCP_HTTP_H
 #define NETWORK_CORE_TCP_HTTP_H
-#include "address.h"
+#include "tcp.h"
 #ifdef ENABLE_NETWORK
 /** Callback for when the HTTP handler has something to tell us. */
 struct HTTPCallback {
 	/**

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -23,13 +23,12 @@ @@
 #include "network_udp.h"
 #include "../window_func.h"
 #include "../gfx_func.h"
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
 #include "../sortlist_type.h"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../core/geometry_func.hpp"
 #include "table/strings.h"
 #include "../table/sprites.h"

src/newgrf.cpp

➞

Show inline comments

@@ @@ -26,29 +26,25 @@ @@
 #include "landscape.h"
 #include "newgrf.h"
 #include "newgrf_cargo.h"
 #include "newgrf_house.h"
 #include "newgrf_sound.h"
 #include "newgrf_station.h"
-#include "industry.h"
+#include "industrytype.h"
 #include "newgrf_canal.h"
 #include "newgrf_commons.h"
 #include "newgrf_townname.h"
 #include "newgrf_industries.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_airport.h"
 #include "rev.h"
 #include "fios.h"
 #include "rail.h"
 #include "strings_func.h"
 #include "date_func.h"
 #include "string_func.h"
 #include "network/network.h"
 #include <map>
 #include "core/alloc_type.hpp"
 #include "core/mem_func.hpp"
 #include "smallmap_gui.h"
 #include "genworld.h"
 #include "gui.h"
 #include "table/strings.h"
 #include "table/build_industry.h"

src/newgrf_airport.cpp

➞

Show inline comments

@@ @@ -8,23 +8,17 @@ @@
  */
 /** @file newgrf_airport.cpp NewGRF handling of airports. */
 #include "stdafx.h"
 #include "debug.h"
 #include "airport.h"
 #include "newgrf_airport.h"
 #include "date_func.h"
 #include "settings_type.h"
 #include "core/alloc_type.hpp"
 #include "newgrf.h"
 #include "newgrf_commons.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_text.h"
 #include "station_base.h"
 #include "table/strings.h"
 #include "newgrf_class_func.h"
 /**
  * Reset airport classes to their default state.
  * This includes initialising the defaults classes with an empty
  * entry, for standard airports.

src/newgrf_airport.h

➞

Show inline comments

@@ @@ -9,12 +9,13 @@ @@
 /** @file newgrf_airport.h NewGRF handling of airports. */
 #ifndef NEWGRF_AIRPORT_H
 #define NEWGRF_AIRPORT_H
 #include "airport.h"
 #include "date_type.h"
 #include "map_type.h"
 #include "newgrf_class.h"
 #include "newgrf_commons.h"
 #include "gfx_type.h"

src/newgrf_airporttiles.cpp

➞

Show inline comments

@@ @@ -8,29 +8,24 @@ @@
  */
 /** @file newgrf_airporttiles.cpp NewGRF handling of airport tiles. */
 #include "stdafx.h"
 #include "debug.h"
 #include "airport.h"
 #include "newgrf.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_sound.h"
 #include "animated_tile_func.h"
 #include "station_base.h"
 #include "water.h"
 #include "viewport_func.h"
 #include "landscape.h"
 #include "company_base.h"
 #include "town.h"
 #include "functions.h"
 #include "core/random_func.hpp"
 #include "table/strings.h"
 #include "table/airporttiles.h"
 #include "date_func.h"
 #include "newgrf_animation_base.h"
 AirportTileSpec AirportTileSpec::tiles[NUM_AIRPORTTILES];
 AirportTileOverrideManager _airporttile_mngr(NEW_AIRPORTTILE_OFFSET, NUM_AIRPORTTILES, INVALID_AIRPORTTILE);

src/newgrf_animation_base.h

➞

Show inline comments

@@ @@ -8,12 +8,19 @@ @@
  */
 /** @file newgrf_animation_base.h Function implementations related to NewGRF animation. */
 /* No inclusion guards as this file must only be included from .cpp files. */
 #include "animated_tile_func.h"
 #include "core/random_func.hpp"
 #include "date_func.h"
 #include "functions.h"
 #include "newgrf_animation_type.h"
 #include "newgrf_callbacks.h"
 /**
  * Helper class for a unified approach to NewGRF animation.
  * @tparam Tbase       Instantiation of this class.
  * @tparam Tspec       NewGRF specification related to the animated tile.
  * @tparam Tobj        Object related to the animated tile.
  * @tparam GetCallback The callback function pointer.

src/newgrf_canal.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file newgrf_canal.cpp Implementation of NewGRF canals. */
 #include "stdafx.h"
 #include "debug.h"
 #include "newgrf_commons.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_canal.h"
 #include "water_map.h"
 /** Table of canal 'feature' sprite groups */

src/newgrf_class_func.h

➞

Show inline comments

@@ @@ -6,14 +6,12 @@ @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file newgrf_class_func.h Implementation of the NewGRF class' functions. */
 #include "stdafx.h"
 #include "core/alloc_func.hpp"
 #include "newgrf_class.h"
 #include "table/strings.h"
 #define DEFINE_NEWGRF_CLASS_METHOD(type) \
 	template <typename Tspec, typename Tid, Tid Tmax> \

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -14,13 +14,12 @@ @@
 #include "stdafx.h"
 #include "landscape.h"
 #include "house.h"
 #include "industrytype.h"
 #include "newgrf.h"
 #include "newgrf_commons.h"
 #include "clear_map.h"
 #include "station_map.h"
 #include "tree_map.h"
 #include "tunnelbridge_map.h"
 #include "genworld.h"
 #include "core/mem_func.hpp"

src/newgrf_commons.h

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
  * loading/saving and mapping of grf entities.
  */
 #ifndef NEWGRF_COMMONS_H
 #define NEWGRF_COMMONS_H
-#include "tile_cmd.h"
+#include "tile_type.h"
 /** Contextx for tile accesses */
 enum TileContext {
 	TCX_NORMAL,         ///< Nothing special.
 	TCX_UPPER_HALFTILE, ///< Querying information about the upper part of a tile with halftile foundation.
 	TCX_ON_BRIDGE,      ///< Querying information about stuff on the bridge (via some bridgehead).

src/newgrf_config.cpp

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file newgrf_config.cpp Finding NewGRFs and configuring them. */
 #include "stdafx.h"
 #include "debug.h"
 #include "3rdparty/md5/md5.h"
 #include "newgrf.h"
 #include "gamelog.h"
 #include "network/network_func.h"
 #include "gfx_func.h"
 #include "newgrf_text.h"
 #include "window_func.h"
 #include "fileio_func.h"

src/newgrf_debug_gui.cpp

➞

Show inline comments

@@ @@ -11,23 +11,19 @@ @@
 #include "stdafx.h"
 #include <stdarg.h>
 #include "window_gui.h"
 #include "window_func.h"
 #include "fileio_func.h"
 #include "gfx_func.h"
 #include "spritecache.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "textbuf_gui.h"
 #include "tunnelbridge_map.h"
 #include "engine_base.h"
 #include "house.h"
 #include "industry.h"
 #include "rail.h"
 #include "station_base.h"
 #include "town.h"
 #include "vehicle_base.h"
 #include "newgrf_airporttiles.h"
 #include "newgrf_debug.h"

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -13,21 +13,18 @@ @@
 #include "debug.h"
 #include "train.h"
 #include "roadveh.h"
 #include "company_func.h"
 #include "newgrf.h"
 #include "newgrf_cargo.h"
 #include "newgrf_engine.h"
 #include "newgrf_spritegroup.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "core/random_func.hpp"
 #include "aircraft.h"
 #include "core/smallmap_type.hpp"
 #include "station_base.h"
 #include "engine_base.h"
 #include "company_base.h"
 #include "newgrf_railtype.h"
 struct WagonOverride {
 	EngineID *train_id;
 	uint trains;

src/newgrf_house.cpp

➞

Show inline comments

@@ @@ -15,22 +15,17 @@ @@
 #include "landscape.h"
 #include "newgrf.h"
 #include "newgrf_house.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_town.h"
 #include "newgrf_sound.h"
 #include "newgrf_commons.h"
 #include "functions.h"
 #include "company_func.h"
 #include "animated_tile_func.h"
 #include "company_base.h"
 #include "town.h"
 #include "core/random_func.hpp"
 #include "sprite.h"
 #include "genworld.h"
 #include "date_func.h"
 #include "newgrf_animation_base.h"
 static BuildingCounts<uint32> _building_counts;
 static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
 HouseOverrideManager _house_mngr(NEW_HOUSE_OFFSET, HOUSE_MAX, INVALID_HOUSE_ID);

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
 #include "stdafx.h"
 #include "debug.h"
 #include "industry.h"
 #include "newgrf.h"
 #include "newgrf_industries.h"
 #include "newgrf_commons.h"
 #include "newgrf_text.h"
 #include "newgrf_town.h"
 #include "newgrf_cargo.h"
 #include "window_func.h"
 #include "town.h"
 #include "company_base.h"

src/newgrf_industries.h

➞

Show inline comments

@@ @@ -10,12 +10,13 @@ @@
 /** @file newgrf_industries.h Functions for NewGRF industries. */
 #ifndef NEWGRF_INDUSTRIES_H
 #define NEWGRF_INDUSTRIES_H
 #include "command_type.h"
 #include "company_type.h"
 #include "newgrf_spritegroup.h"
 /** When should the industry(tile) be triggered for random bits? */
 enum IndustryTrigger {
 	/** Triggered each tile loop */
 	INDUSTRY_TRIGGER_TILELOOP_PROCESS = 1,

src/newgrf_industrytiles.cpp

➞

Show inline comments

@@ @@ -11,25 +11,21 @@ @@
 #include "stdafx.h"
 #include "debug.h"
 #include "viewport_func.h"
 #include "landscape.h"
 #include "newgrf.h"
 #include "newgrf_commons.h"
 #include "newgrf_industries.h"
 #include "newgrf_industrytiles.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
 #include "industry.h"
 #include "functions.h"
 #include "town.h"
 #include "command_func.h"
 #include "animated_tile_func.h"
 #include "water.h"
 #include "sprite.h"
 #include "date_func.h"
 #include "newgrf_animation_base.h"
 #include "table/strings.h"
 /**
  * Based on newhouses equivalent, but adapted for newindustries

src/newgrf_railtype.cpp

➞

Show inline comments

@@ @@ -7,26 +7,17 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file newgrf_railtype.cpp NewGRF handling of rail types. */
 #include "stdafx.h"
 #include "openttd.h"
 #include "debug.h"
 #include "strings_type.h"
 #include "rail.h"
 #include "road_map.h"
 #include "newgrf.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_commons.h"
 #include "newgrf_railtype.h"
 #include "newgrf_spritegroup.h"
 #include "core/bitmath_func.hpp"
 #include "date_func.h"
 #include "depot_base.h"
 #include "rail_map.h"
 static uint32 RailTypeGetRandomBits(const ResolverObject *object)
+{
 	TileIndex tile = object->u.routes.tile;
 	uint tmp = CountBits(tile + (TileX(tile) + TileY(tile)) * TILE_SIZE);
 	return GB(tmp, 0, 2);

src/newgrf_spritegroup.cpp

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file newgrf_spritegroup.cpp Handling of primarily NewGRF action 2. */
 #include "stdafx.h"
 #include "newgrf.h"
 #include "newgrf_spritegroup.h"
 #include "sprite.h"
 #include "core/bitmath_func.hpp"
 #include "core/pool_func.hpp"
 SpriteGroupPool _spritegroup_pool("SpriteGroup");
 INSTANTIATE_POOL_METHODS(SpriteGroup)
 RealSpriteGroup::~RealSpriteGroup()

src/newgrf_spritegroup.h

➞

Show inline comments

@@ @@ -12,13 +12,12 @@ @@
 #ifndef NEWGRF_SPRITEGROUP_H
 #define NEWGRF_SPRITEGROUP_H
 #include "town_type.h"
 #include "gfx_type.h"
 #include "engine_type.h"
 #include "tile_type.h"
 #include "core/pool_type.hpp"
 #include "house_type.h"
 #include "newgrf_callbacks.h"
 #include "newgrf_generic.h"
 #include "newgrf_storage.h"

src/newgrf_station.cpp

➞

Show inline comments

@@ @@ -12,30 +12,24 @@ @@
 #include "stdafx.h"
 #include "debug.h"
 #include "station_base.h"
 #include "waypoint_base.h"
 #include "roadstop_base.h"
 #include "newgrf_cargo.h"
 #include "newgrf_commons.h"
 #include "newgrf_station.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_sound.h"
 #include "newgrf_railtype.h"
 #include "town.h"
 #include "newgrf_town.h"
 #include "date_func.h"
 #include "company_func.h"
 #include "animated_tile_func.h"
 #include "functions.h"
 #include "tunnelbridge_map.h"
 #include "newgrf.h"
 #include "core/random_func.hpp"
 #include "newgrf_animation_base.h"
 #include "newgrf_class_func.h"
 #include "table/strings.h"
 template <typename Tspec, typename Tid, Tid Tmax>
 /* static */ void NewGRFClass<Tspec, Tid, Tmax>::InsertDefaults()
+{
 	/* Set up initial data */
 	classes[0].global_id = 'DFLT';

src/object_cmd.cpp

➞

Show inline comments

@@ @@ -15,16 +15,14 @@ @@
 #include "viewport_func.h"
 #include "company_base.h"
 #include "town.h"
 #include "bridge_map.h"
 #include "genworld.h"
 #include "autoslope.h"
 #include "transparency.h"
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "company_gui.h"
 #include "cheat_type.h"
 #include "landscape_type.h"
 #include "object.h"
 #include "cargopacket.h"
 #include "sprite.h"
@@ @@ -32,13 +30,12 @@ @@
 #include "core/pool_func.hpp"
 #include "object_map.h"
 #include "object_base.h"
 #include "date_func.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "table/object_land.h"
 ObjectPool _object_pool("Object");
 INSTANTIATE_POOL_METHODS(Object)
 /* static */ Object *Object::GetByTile(TileIndex tile)

src/object_map.h

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file object_map.h Map accessors for object tiles. */
 #ifndef OBJECT_MAP_H
 #define OBJECT_MAP_H
 #include "tile_map.h"
 #include "water_map.h"
 #include "object_type.h"
 /**
  * Gets the ObjectType of the given object tile
  * @param t the tile to get the type from.

src/openttd.cpp

➞

Show inline comments

@@ @@ -20,13 +20,12 @@ @@
 #include "gui.h"
 #include "sound_func.h"
 #include "window_func.h"
 #include "base_media_base.h"
 #include "saveload/saveload.h"
 #include "landscape.h"
 #include "company_func.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "fios.h"
 #include "aircraft.h"
 #include "roadveh.h"
@@ @@ -52,21 +51,18 @@ @@
 #include "elrail_func.h"
 #include "rev.h"
 #include "highscore.h"
 #include "thread/thread.h"
 #include "station_base.h"
 #include "crashlog.h"
 #include "company_base.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "core/random_func.hpp"
 #include "rail_gui.h"
 #include "core/backup_type.hpp"
 #include "hotkeys.h"
 #include "newgrf_commons.h"
 #include "town.h"
 #include "industry.h"
 #include <stdarg.h>

src/order_backup.cpp

➞

Show inline comments

@@ @@ -12,15 +12,13 @@ @@
 #include "stdafx.h"
 #include "command_func.h"
 #include "core/pool_func.hpp"
 #include "network/network.h"
 #include "network/network_func.h"
 #include "order_backup.h"
 #include "order_base.h"
 #include "vehicle_base.h"
 #include "settings_type.h"
 OrderBackupPool _order_backup_pool("BackupOrder");
 INSTANTIATE_POOL_METHODS(OrderBackup)
 OrderBackup::~OrderBackup()
+{

src/order_backup.h

➞

Show inline comments

@@ @@ -10,17 +10,17 @@ @@
 /** @file order_backup.h Functions related to order backups. */
 #ifndef ORDER_BACKUP_H
 #define ORDER_BACKUP_H
 #include "core/pool_type.hpp"
 #include "date_type.h"
 #include "group_type.h"
 #include "order_type.h"
 #include "vehicle_type.h"
 #include "tile_type.h"
 #include "group_type.h"
 #include "company_type.h"
 #include "vehicle_type.h"
 /** Unique identifier for an order backup. */
 typedef uint8 OrderBackupID;
 struct OrderBackup;
 /** The pool type for order backups. */

src/order_gui.cpp

➞

Show inline comments

@@ @@ -9,17 +9,16 @@ @@
 /** @file order_gui.cpp GUI related to orders. */
 #include "stdafx.h"
 #include "command_func.h"
 #include "viewport_func.h"
-#include "depot_base.h"
+#include "depot_map.h"
 #include "vehicle_gui.h"
 #include "roadveh.h"
 #include "timetable.h"
 #include "cargotype.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "company_func.h"
 #include "widgets/dropdown_func.h"
 #include "textbuf_gui.h"
@@ @@ -28,13 +27,12 @@ @@
 #include "network/network.h"
 #include "station_base.h"
 #include "waypoint_base.h"
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 /** Widget numbers of the order window. */
 enum OrderWindowWidgets {
 	ORDER_WIDGET_CAPTION,
 	ORDER_WIDGET_TIMETABLE_VIEW,

src/pathfinder/npf/npf.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file npf.cpp Implementation of the NPF pathfinder. */
 #include "../../stdafx.h"
 #include "../../debug.h"
 #include "../../landscape.h"
 #include "../../network/network.h"
 #include "../../functions.h"
 #include "../../ship.h"
 #include "../../roadstop_base.h"
 #include "../pathfinder_func.h"
 #include "../pathfinder_type.h"

src/pathfinder/yapf/yapf.h

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file yapf.h Entry point for OpenTTD to YAPF. */
 #ifndef  YAPF_H
 #define  YAPF_H
 #include "../../direction_type.h"
 #include "../../station_type.h"
 #include "../../track_type.h"
 #include "../../vehicle_type.h"
 #include "../pathfinder_type.h"
 /**
  * Finds the best path for given ship using YAPF.

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -8,23 +8,18 @@ @@
  */
 /** @file rail_cmd.cpp Handling of rail tiles. */
 #include "stdafx.h"
 #include "cmd_helper.h"
 #include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "engine_base.h"
 #include "depot_base.h"
 #include "pathfinder/yapf/yapf_cache.h"
 #include "newgrf_engine.h"
 #include "landscape_type.h"
 #include "newgrf_debug.h"
 #include "newgrf_railtype.h"
 #include "newgrf_commons.h"
 #include "train.h"
 #include "autoslope.h"
 #include "water.h"
 #include "tunnelbridge_map.h"
 #include "window_func.h"
 #include "vehicle_func.h"
@@ @@ -36,13 +31,12 @@ @@
 #include "pbs.h"
 #include "company_base.h"
 #include "core/backup_type.hpp"
 #include "date_func.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 #include "table/railtypes.h"
 #include "table/track_land.h"
 /** Helper type for lists/vectors of trains */
 typedef SmallVector<Train *, 16> TrainList;

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -32,13 +32,12 @@ @@
 #include "core/geometry_func.hpp"
 #include "hotkeys.h"
 #include "station_map.h"
 #include "tunnelbridge_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 static RailType _cur_railtype;               ///< Rail type of the current build-rail toolbar.
 static bool _remove_button_clicked;          ///< Flag whether 'remove' toggle-button is currently enabled
 static DiagDirection _build_depot_direction; ///< Currently selected depot direction
 static byte _waypoint_count = 1;             ///< Number of waypoint types

src/rail_gui.h

➞

Show inline comments

@@ @@ -11,12 +11,12 @@ @@
 #ifndef RAIL_GUI_H
 #define RAIL_GUI_H
 #include "rail_type.h"
 Window *ShowBuildRailToolbar(RailType railtype);
+struct Window *ShowBuildRailToolbar(RailType railtype);
 void ReinitGuiAfterToggleElrail(bool disable);
 bool ResetSignalVariant(int32 = 0);
 void InitializeRailGUI();
 #endif /* RAIL_GUI_H */

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file road_cmd.cpp Commands related to road tiles. */
 #include "stdafx.h"
 #include "cmd_helper.h"
 #include "road_internal.h"
 #include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "pathfinder/yapf/yapf_cache.h"
 #include "depot_base.h"
 #include "newgrf.h"
 #include "autoslope.h"

src/road_gui.cpp

➞

Show inline comments

@@ @@ -14,26 +14,24 @@ @@
 #include "window_gui.h"
 #include "station_gui.h"
 #include "terraform_gui.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "road_cmd.h"
 #include "road_map.h"
 #include "station_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "company_func.h"
 #include "tunnelbridge.h"
 #include "tunnelbridge_map.h"
 #include "tilehighlight_func.h"
 #include "company_base.h"
 #include "hotkeys.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 static void ShowRVStationPicker(Window *parent, RoadStopType rs);
 static void ShowRoadDepotPicker(Window *parent);
 static bool _remove_button_clicked;

src/road_gui.h

➞

Show inline comments

@@ @@ -11,10 +11,10 @@ @@
 #ifndef ROAD_GUI_H
 #define ROAD_GUI_H
 #include "road_type.h"
 Window *ShowBuildRoadToolbar(RoadType roadtype);
 Window *ShowBuildRoadScenToolbar();
 struct Window *ShowBuildRoadToolbar(RoadType roadtype);
 struct Window *ShowBuildRoadScenToolbar();
 #endif /* ROAD_GUI_H */

src/roadstop.cpp

➞

Show inline comments

@@ @@ -12,13 +12,12 @@ @@
 #include "stdafx.h"
 #include "roadveh.h"
 #include "core/pool_func.hpp"
 #include "roadstop_base.h"
 #include "station_base.h"
 #include "vehicle_func.h"
 #include "landscape.h"
 RoadStopPool _roadstop_pool("RoadStop");
 INSTANTIATE_POOL_METHODS(RoadStop)
 /**
  * De-Initializes RoadStops.

src/roadveh.h

➞

Show inline comments

@@ @@ -9,17 +9,17 @@ @@
 /** @file src/roadveh.h Road vehicle states */
 #ifndef ROADVEH_H
 #define ROADVEH_H
 #include "road_type.h"
 #include "ground_vehicle.hpp"
 #include "engine_base.h"
 #include "cargotype.h"
 #include "road_map.h"
 #include "track_func.h"
 #include "road_type.h"
 struct RoadVehicle;
 /** Road vehicle states */
 enum RoadVehicleStates {
 	/*

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -7,13 +7,12 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file roadveh_cmd.cpp Handling of road vehicles. */
 #include "stdafx.h"
 #include "landscape.h"
 #include "roadveh.h"
 #include "command_func.h"
 #include "news_func.h"
 #include "pathfinder/npf/npf_func.h"
 #include "station_base.h"
 #include "company_func.h"
@@ @@ -26,28 +25,23 @@ @@
 #include "tunnelbridge_map.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "autoreplace_gui.h"
 #include "ai/ai.hpp"
 #include "depot_map.h"
 #include "effectvehicle_func.h"
 #include "effectvehicle_base.h"
 #include "roadstop_base.h"
 #include "cargotype.h"
 #include "spritecache.h"
 #include "core/random_func.hpp"
 #include "engine_base.h"
 #include "company_base.h"
 #include "engine_func.h"
 #include "core/backup_type.hpp"
 #include "table/strings.h"
 #include "table/sprites.h"
 static const uint16 _roadveh_images[63] = {
 xCD4, 0xCDC, 0xCE4, 0xCEC, 0xCF4, 0xCFC, 0xD0C, 0xD14,
 xD24, 0xD1C, 0xD2C, 0xD04, 0xD1C, 0xD24, 0xD6C, 0xD74,
 xD7C, 0xC14, 0xC1C, 0xC24, 0xC2C, 0xC34, 0xC3C, 0xC4C,
 xC54, 0xC64, 0xC5C, 0xC6C, 0xC44, 0xC5C, 0xC64, 0xCAC,

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -19,22 +19,20 @@ @@
 #include "../network/network.h"
 #include "../gfxinit.h"
 #include "../functions.h"
 #include "../industry.h"
 #include "../clear_map.h"
 #include "../vehicle_func.h"
 #include "../debug.h"
 #include "../string_func.h"
 #include "../date_func.h"
 #include "../roadveh.h"
 #include "../train.h"
 #include "../station_base.h"
 #include "../waypoint_base.h"
 #include "../roadstop_base.h"
 #include "../tunnelbridge_map.h"
 #include "../landscape.h"
 #include "../pathfinder/yapf/yapf_cache.h"
 #include "../elrail_func.h"
 #include "../signs_func.h"
 #include "../aircraft.h"
 #include "../object_map.h"
 #include "../object_base.h"
@@ @@ -45,15 +43,13 @@ @@
 #include "../ai/ai_gui.hpp"
 #include "../town.h"
 #include "../economy_base.h"
 #include "../animated_tile_func.h"
 #include "../subsidy_base.h"
 #include "../subsidy_func.h"
 #include "../company_base.h"
 #include "../newgrf.h"
 #include "../engine_base.h"
 #include "../engine_func.h"
 #include "../rail_gui.h"
 #include "../core/backup_type.hpp"
 #include "table/strings.h"

src/saveload/company_sl.cpp

➞

Show inline comments

@@ @@ -7,13 +7,12 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file company_sl.cpp Code handling saving and loading of company data */
 #include "../stdafx.h"
 #include "../company_base.h"
 #include "../company_func.h"
 #include "../company_manager_face.h"
 #include "../fios.h"
 #include "saveload.h"

src/saveload/gamelog_sl.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file gamelog_sl.cpp Code handling saving and loading of gamelog data */
 #include "../stdafx.h"
 #include "../gamelog_internal.h"
 #include "../core/alloc_func.hpp"
 #include "saveload.h"
 static const SaveLoad _glog_action_desc[] = {
 	SLE_VAR(LoggedAction, tick,              SLE_UINT16),
 	SLE_END()

src/saveload/map_sl.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file map_sl.cpp Code handling saving and loading of map */
 #include "../stdafx.h"
 #include "../map_func.h"
 #include "../core/alloc_type.hpp"
 #include "../core/bitmath_func.hpp"
 #include "../fios.h"
 #include "saveload.h"
 static uint32 _map_dim_x;

src/saveload/misc_sl.cpp

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ @@
 #include "../zoom_func.h"
 #include "../vehicle_func.h"
 #include "../window_gui.h"
 #include "../window_func.h"
 #include "../viewport_func.h"
 #include "../gfx_func.h"
 #include "../company_base.h"
 #include "../core/random_func.hpp"
 #include "../fios.h"
 #include "saveload.h"
 extern TileIndex _cur_tileloop_tile;

src/saveload/newgrf_sl.cpp

➞

Show inline comments

@@ @@ -7,16 +7,13 @@ @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file newgrf_sl.cpp Code handling saving and loading of newgrf config */
 #include "../stdafx.h"
 #include "../newgrf_config.h"
 #include "../core/bitmath_func.hpp"
 #include "../core/alloc_func.hpp"
 #include "../gfx_func.h"
 #include "../fios.h"
 #include "saveload.h"
 #include "newgrf_sl.h"
 /** Save and load the mapping between a spec and the NewGRF it came from. */

src/saveload/oldloader_sl.cpp

➞

Show inline comments

@@ @@ -22,15 +22,12 @@ @@
 #include "../subsidy_base.h"
 #include "../debug.h"
 #include "../depot_base.h"
 #include "../date_func.h"
 #include "../vehicle_func.h"
 #include "../effectvehicle_base.h"
 #include "../core/mem_func.hpp"
 #include "../core/alloc_type.hpp"
 #include "../engine_base.h"
 #include "../engine_func.h"
 #include "../company_base.h"
 #include "saveload_internal.h"
 #include "oldloader.h"
 #include "table/strings.h"

src/saveload/saveload.cpp

➞

Show inline comments

@@ @@ -37,13 +37,12 @@ @@
 #include "../roadstop_base.h"
 #include "../statusbar_gui.h"
 #include "../fileio_func.h"
 #include "../gamelog.h"
 #include "../string_func.h"
 #include "../engine_base.h"
 #include "../company_base.h"
 #include "../fios.h"
 #include "table/strings.h"
 #include "saveload_internal.h"

src/saveload/vehicle_sl.cpp

➞

Show inline comments

@@ @@ -14,13 +14,12 @@ @@
 #include "../train.h"
 #include "../roadveh.h"
 #include "../ship.h"
 #include "../aircraft.h"
 #include "../station_base.h"
 #include "../effectvehicle_base.h"
 #include "../engine_base.h"
 #include "saveload.h"
 #include <map>
 /*

src/script/script_info.cpp

➞

Show inline comments

@@ @@ -8,14 +8,12 @@ @@
  */
 /** @file script_info.cpp Implementation of ScriptFileInfo. */
 #include "../stdafx.h"
 #include <squirrel.h>
 #include "squirrel.hpp"
 #include "squirrel_helper.hpp"
 #include "script_info.hpp"
 #include "script_scanner.hpp"
 ScriptFileInfo::~ScriptFileInfo()

src/script/script_scanner.cpp

➞

Show inline comments

@@ @@ -11,13 +11,12 @@ @@
 #include "../stdafx.h"
 #include "../string_func.h"
 #include "../fileio_func.h"
 #include <sys/stat.h>
 #include <squirrel.h>
 #include "../script/squirrel.hpp"
 #include "script_scanner.hpp"
 void ScriptScanner::ScanDir(const char *dirname, const char *info_file_name)
+{
 	extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);

src/script/squirrel.cpp

➞

Show inline comments

@@ @@ -6,17 +6,15 @@ @@
  * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file squirrel.cpp the implementation of the Squirrel class. It handles all Squirrel-stuff and gives a nice API back to work with. */
 #include <squirrel.h>
 #include <stdarg.h>
 #include "../stdafx.h"
 #include "../debug.h"
 #include "squirrel.hpp"
 #include "squirrel_std.hpp"
 #include "../fileio_func.h"
 #include <sqstdaux.h>
 #include <../squirrel/sqpcheader.h>
 #include <../squirrel/sqvm.h>

src/script/squirrel.hpp

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file squirrel.hpp defines the Squirrel class */
 #ifndef SQUIRREL_HPP
 #define SQUIRREL_HPP
 #include <squirrel.h>
 class Squirrel {
 private:
 	typedef void (SQPrintFunc)(bool error_msg, const SQChar *message);
 	HSQUIRRELVM vm;          ///< The VirtualMachine instnace for squirrel
 	void *global_pointer;    ///< Can be set by who ever initializes Squirrel

src/script/squirrel_class.hpp

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file squirrel_class.hpp Defines templates for converting C++ classes to Squirrel classes */
 #ifndef SQUIRREL_CLASS_HPP
 #define SQUIRREL_CLASS_HPP
 #include "squirrel_helper.hpp"
 /**
  * The template to define classes in Squirrel. It takes care of the creation
  *  and calling of such classes, to make the AI Layer cleaner while having a
  *  powerful script as possible AI language.
  */
 template <class CL>

src/script/squirrel_helper.hpp

➞

Show inline comments

@@ @@ -9,13 +9,13 @@ @@
 /** @file squirrel_helper.hpp declarations and parts of the implementation of the class for convert code */
 #ifndef SQUIRREL_HELPER_HPP
 #define SQUIRREL_HELPER_HPP
-#include <squirrel.h>
+#include "squirrel.hpp"
 #include "../core/math_func.hpp"
 #include "../core/smallvec_type.hpp"
 #include "../economy_type.h"
 #include "../string_func.h"
 #include "squirrel_helper_type.hpp"

src/script/squirrel_std.cpp

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file squirrel_std.cpp Implements the Squirrel Standard Function class */
 #include <squirrel.h>
 #include <sqstdmath.h>
 #include "../stdafx.h"
 #include "../debug.h"
 #include "squirrel.hpp"
 #include "squirrel_std.hpp"
 #include "../core/alloc_func.hpp"
 #include "../core/math_func.hpp"
 SQInteger SquirrelStd::min(HSQUIRRELVM vm)

src/script/squirrel_std.hpp

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file squirrel_std.hpp defines the Squirrel Standard Function class */
 #ifndef SQUIRREL_STD_HPP
 #define SQUIRREL_STD_HPP
 #include "squirrel.hpp"
 #if defined(__APPLE__)
 /* Which idiotic system makes 'require' a macro? :s Oh well.... */
 #undef require
 #endif /* __APPLE__ */
 /**

src/settings.cpp

➞

Show inline comments

@@ @@ -58,14 +58,12 @@ @@
 #include "settings_func.h"
 #include "ini_type.h"
 #include "ai/ai_config.hpp"
 #include "ai/ai.hpp"
 #include "newgrf.h"
 #include "ship.h"
 #include "company_base.h"
 #include "engine_base.h"
 #include "smallmap_gui.h"
 #include "roadveh.h"
 #include "fios.h"
 #include "void_map.h"
 #include "station_base.h"

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -29,13 +29,12 @@ @@
 #include "base_media_base.h"
 #include "company_base.h"
 #include "company_func.h"
 #include "viewport_func.h"
 #include "core/geometry_func.hpp"
 #include "ai/ai.hpp"
 #include <map>
 #include "table/sprites.h"
 #include "table/strings.h"
 static const StringID _units_dropdown[] = {
 	STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL,

src/ship_cmd.cpp

➞

Show inline comments

@@ @@ -27,24 +27,21 @@ @@
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "date_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "autoreplace_gui.h"
 #include "effectvehicle_func.h"
 #include "effectvehicle_base.h"
 #include "ai/ai.hpp"
 #include "pathfinder/opf/opf_ship.h"
 #include "landscape_type.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "company_base.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 static const uint16 _ship_sprites[] = {0x0E5D, 0x0E55, 0x0E65, 0x0E6D};
 static inline TrackBits GetTileShipTrackStatus(TileIndex tile)
+{
 	return TrackStatusToTrackBits(GetTileTrackStatus(tile, TRANSPORT_WATER, 0));

src/signal_type.h

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file signal_type.h Types and classes related to signals. */
 #ifndef SIGNAL_TYPE_H
 #define SIGNAL_TYPE_H
 #include "core/enum_type.hpp"
 /** Variant of the signal, i.e. how does the signal look? */
 enum SignalVariant {
 	SIG_ELECTRIC  = 0, ///< Light signal
 	SIG_SEMAPHORE = 1  ///< Old-fashioned semaphore signal
 };

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -25,13 +25,12 @@ @@
 #include "vehicle_base.h"
 #include "sound_func.h"
 #include "window_func.h"
 #include "company_base.h"
 #include "table/strings.h"
 #include "table/sprites.h"
 /** Widget numbers of the small map window. */
 enum SmallMapWindowWidgets {
 	SM_WIDGET_CAPTION,           ///< Caption widget.
 	SM_WIDGET_MAP_BORDER,        ///< Border around the smallmap.
 	SM_WIDGET_MAP,               ///< Panel containing the smallmap.

src/sprite.cpp

➞

Show inline comments

@@ @@ -8,18 +8,16 @@ @@
  */
 /** @file sprite.cpp Handling of sprites */
 #include "stdafx.h"
 #include "sprite.h"
 #include "tile_cmd.h"
 #include "viewport_func.h"
 #include "landscape.h"
 #include "spritecache.h"
 #include "table/sprites.h"
 /**
  * Draws a tile sprite sequence.
  * @param ti The tile to draw on
  * @param dts Sprite and subsprites to draw
  * @param to The transparancy bit that toggles drawing of these sprites

src/sprite.h

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file sprite.h Base for drawing complex sprites. */
 #ifndef SPRITE_H
 #define SPRITE_H
 #include "gfx_type.h"
 #include "transparency.h"
 #include "table/sprites.h"
 #define GENERAL_SPRITE_COLOUR(colour) ((colour) + PALETTE_RECOLOUR_START)
 #define COMPANY_SPRITE_COLOUR(owner) (GENERAL_SPRITE_COLOUR(_company_colours[owner]))

src/station_base.h

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file station_base.h Base classes/functions for stations. */
 #ifndef STATION_BASE_H
 #define STATION_BASE_H
 #include "base_station_base.h"
 #include "airport.h"
 #include "newgrf_airport.h"
 #include "cargopacket.h"
 #include "industry_type.h"
 #include "newgrf_storage.h"
 typedef Pool<BaseStation, StationID, 32, 64000> StationPool;

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -10,13 +10,12 @@ @@
 /** @file station_cmd.cpp Handling of station tiles. */
 #include "stdafx.h"
 #include "aircraft.h"
 #include "bridge_map.h"
 #include "cmd_helper.h"
 #include "landscape.h"
 #include "viewport_func.h"
 #include "command_func.h"
 #include "town.h"
 #include "news_func.h"
 #include "train.h"
 #include "roadveh.h"
@@ @@ -43,13 +42,12 @@ @@
 #include "waypoint_base.h"
 #include "waypoint_func.h"
 #include "pbs.h"
 #include "debug.h"
 #include "core/random_func.hpp"
 #include "company_base.h"
 #include "newgrf.h"
 #include "table/airporttile_ids.h"
 #include "newgrf_airporttiles.h"
 #include "order_backup.h"
 #include "table/strings.h"

src/station_gui.cpp

➞

Show inline comments

@@ @@ -27,13 +27,12 @@ @@
 #include "tilehighlight_func.h"
 #include "company_base.h"
 #include "sortlist_type.h"
 #include "core/geometry_func.hpp"
 #include "table/strings.h"
 #include "table/sprites.h"
 /**
  * Draw a (multi)line of cargos seperated by commas, and prefixed with a string.
  * @param cargo_mask Mask of cargos to include in the list.
  * @param r          Rectangle to draw the cargos in.
  * @param prefix     String to use as prefix for the list of cargos.

src/strings.cpp

➞

Show inline comments

@@ @@ -31,13 +31,12 @@ @@
 #include "vehicle_base.h"
 #include "engine_base.h"
 #include "strgen/strgen.h"
 #include "townname_func.h"
 #include "string_func.h"
 #include "company_base.h"
 #include "industrytype.h"
 #include "smallmap_gui.h"
 #include "table/strings.h"
 #include "table/control_codes.h"
 DynamicLanguages _dynlang;     ///< Language information of the program.

src/terraform_gui.cpp

➞

Show inline comments

@@ @@ -19,22 +19,21 @@ @@
 #include "viewport_func.h"
 #include "command_func.h"
 #include "signs_func.h"
 #include "functions.h"
 #include "sound_func.h"
 #include "base_station_base.h"
-#include "object_map.h"
+#include "object_type.h"
 #include "textbuf_gui.h"
 #include "genworld.h"
 #include "tree_map.h"
 #include "landscape_type.h"
 #include "tilehighlight_func.h"
 #include "strings_func.h"
 #include "hotkeys.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 void CcTerraform(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+{
 	if (result.Succeeded()) {
 		SndPlayTileFx(SND_1F_SPLAT, tile);

src/tile_map.cpp

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ @@
  */
 /** @file tile_map.cpp Global tile accessors. */
 #include "stdafx.h"
 #include "tile_map.h"
 #include "core/math_func.hpp"
 /**
  * Return the slope of a given tile
  * @param tile Tile to compute slope of
  * @param h    If not \c NULL, pointer to storage of z height
  * @return Slope of the tile, except for the HALFTILE part

src/tilearea.cpp

➞

Show inline comments

@@ @@ -8,14 +8,13 @@ @@
  */
 /** @file tilearea.cpp Handling of tile areas. */
 #include "stdafx.h"
 #include "tile_map.h"
 #include "core/math_func.hpp"
 #include "map_func.h"
 #include "tilearea_type.h"
 /**
  * Construct this tile area based on two points.
  * @param start the start of the area
  * @param end   the end of the area

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -36,13 +36,12 @@ @@
 #include "console_gui.h"
 #include "news_gui.h"
 #include "ai/ai_gui.hpp"
 #include "tilehighlight_func.h"
 #include "rail.h"
 #include "widgets/dropdown_type.h"
 #include "company_base.h"
 #include "smallmap_gui.h"
 #include "graph_gui.h"
 #include "textbuf_gui.h"
 #include "newgrf_debug.h"
 #include "hotkeys.h"

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ @@
 #include "news_func.h"
 #include "gui.h"
 #include "object.h"
 #include "genworld.h"
 #include "newgrf_debug.h"
 #include "newgrf_house.h"
 #include "newgrf_commons.h"
 #include "newgrf_text.h"
 #include "newgrf_config.h"
 #include "autoslope.h"
 #include "tunnelbridge_map.h"
 #include "strings_func.h"
 #include "window_func.h"
@@ @@ -36,13 +35,12 @@ @@
 #include "newgrf_cargo.h"
 #include "cheat_type.h"
 #include "functions.h"
 #include "animated_tile_func.h"
 #include "date_func.h"
 #include "subsidy_func.h"
 #include "core/smallmap_type.hpp"
 #include "core/pool_func.hpp"
 #include "town.h"
 #include "townname_func.h"
 #include "townname_type.h"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -15,34 +15,29 @@ @@
 #include "command_func.h"
 #include "pathfinder/npf/npf_func.h"
 #include "pathfinder/yapf/yapf.hpp"
 #include "news_func.h"
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "newgrf_text.h"
 #include "group.h"
 #include "table/sprites.h"
 #include "strings_func.h"
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "autoreplace_gui.h"
 #include "ai/ai.hpp"
 #include "newgrf_station.h"
 #include "effectvehicle_func.h"
 #include "effectvehicle_base.h"
 #include "gamelog.h"
 #include "network/network.h"
 #include "spritecache.h"
 #include "core/random_func.hpp"
 #include "company_base.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "newgrf.h"
 #include "order_backup.h"
 #include "table/strings.h"
 #include "table/train_cmd.h"

src/train_gui.cpp

➞

Show inline comments

@@ @@ -14,15 +14,13 @@ @@
 #include "gfx_func.h"
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "train.h"
 #include "strings_func.h"
 #include "vehicle_func.h"
 #include "engine_base.h"
 #include "window_func.h"
 #include "settings_type.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 void CcBuildWagon(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+{

src/transport_type.h

➞

Show inline comments

@@ @@ -9,12 +9,14 @@ @@
 /** @file transport_type.h Base types related to transport. */
 #ifndef TRANSPORT_TYPE_H
 #define TRANSPORT_TYPE_H
 #include "core/enum_type.hpp"
 typedef uint16 UnitID;
 /** Available types of transport */
 enum TransportType {
 	/* These constants are for now linked to the representation of bridges
 	 * and tunnels, so they can be used by GetTileTrackStatus_TunnelBridge.

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -11,14 +11,12 @@ @@
  * @file tunnelbridge_cmd.cpp
  * This file deals with tunnels and bridges (non-gui stuff)
  * @todo seperate this file into two
  */
 #include "stdafx.h"
 #include "rail_map.h"
 #include "landscape.h"
 #include "object.h"
 #include "viewport_func.h"
 #include "cmd_helper.h"
 #include "command_func.h"
 #include "town.h"
 #include "train.h"
@@ @@ -34,16 +32,14 @@ @@
 #include "functions.h"
 #include "vehicle_func.h"
 #include "sound_func.h"
 #include "tunnelbridge.h"
 #include "cheat_type.h"
 #include "elrail_func.h"
 #include "landscape_type.h"
 #include "pbs.h"
 #include "company_base.h"
 #include "engine_base.h"
 #include "newgrf_railtype.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "table/bridge_land.h"

src/vehicle.cpp

➞

Show inline comments

@@ @@ -8,27 +8,24 @@ @@
  */
 /** @file vehicle.cpp Base implementations of all vehicles. */
 #include "stdafx.h"
 #include "gui.h"
 #include "debug.h"
 #include "roadveh.h"
 #include "ship.h"
 #include "spritecache.h"
 #include "landscape.h"
 #include "timetable.h"
 #include "viewport_func.h"
 #include "news_func.h"
 #include "command_func.h"
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_debug.h"
 #include "newgrf_engine.h"
 #include "newgrf_sound.h"
 #include "newgrf_station.h"
 #include "group.h"
 #include "group_gui.h"
 #include "strings_func.h"
 #include "zoom_func.h"
@@ @@ -37,26 +34,22 @@ @@
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_func.h"
 #include "autoreplace_gui.h"
 #include "station_base.h"
 #include "ai/ai.hpp"
 #include "core/smallmap_type.hpp"
 #include "depot_func.h"
 #include "network/network.h"
 #include "core/pool_func.hpp"
 #include "economy_base.h"
 #include "articulated_vehicles.h"
 #include "roadstop_base.h"
 #include "core/random_func.hpp"
 #include "engine_base.h"
 #include "newgrf.h"
 #include "core/backup_type.hpp"
 #include "order_backup.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #define GEN_HASH(x, y) ((GB((y), 6, 6) << 6) + GB((x), 7, 6))
 VehicleID _vehicle_id_ctr_day;
 const Vehicle *_place_clicked_vehicle;

src/vehicle_cmd.cpp

➞

Show inline comments

@@ @@ -16,21 +16,19 @@ @@
 #include "cmd_helper.h"
 #include "command_func.h"
 #include "company_func.h"
 #include "vehicle_gui.h"
 #include "train.h"
 #include "aircraft.h"
 #include "newgrf_engine.h"
 #include "newgrf_text.h"
 #include "functions.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "string_func.h"
 #include "depot_map.h"
 #include "vehiclelist.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "articulated_vehicles.h"
 #include "autoreplace_gui.h"
 #include "company_base.h"
 #include "order_backup.h"

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -15,40 +15,34 @@ @@
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"
 #include "vehicle_gui.h"
 #include "vehicle_gui_base.h"
 #include "viewport_func.h"
 #include "newgrf_engine.h"
 #include "newgrf_text.h"
 #include "newgrf_debug.h"
 #include "waypoint_base.h"
 #include "roadveh.h"
 #include "train.h"
 #include "aircraft.h"
-#include "depot_base.h"
+#include "depot_map.h"
 #include "group_gui.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "vehicle_func.h"
 #include "autoreplace_gui.h"
 #include "string_func.h"
 #include "widgets/dropdown_func.h"
 #include "timetable.h"
 #include "vehiclelist.h"
 #include "articulated_vehicles.h"
 #include "cargotype.h"
 #include "spritecache.h"
 #include "core/geometry_func.hpp"
 #include "company_base.h"
 #include "engine_base.h"
 #include "engine_func.h"
 #include "newgrf.h"
 #include "station_base.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 Sorting _sorting;
 static GUIVehicleList::SortFunction VehicleNumberSorter;
 static GUIVehicleList::SortFunction VehicleNameSorter;

src/viewport.cpp

➞

Show inline comments

@@ @@ -43,13 +43,12 @@ @@
 #include "company_func.h"
 #include "waypoint_func.h"
 #include "window_func.h"
 #include "tilehighlight_func.h"
 #include "window_gui.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 PlaceProc *_place_proc;
 Point _tile_fract_coords;
 struct StringSpriteToDraw {

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ @@
 #include "station_base.h"
 #include "ai/ai.hpp"
 #include "core/random_func.hpp"
 #include "core/backup_type.hpp"
 #include "date_func.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 /**
  * Describes from which directions a specific slope can be flooded (if the tile is floodable at all).
  */
 static const uint8 _flood_from_dirs[] = {

src/water_map.h

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file water_map.h Map accessors for water tiles. */
 #ifndef WATER_MAP_H
 #define WATER_MAP_H
 #include "core/math_func.hpp"
 #include "depot_type.h"
 #include "tile_map.h"
 /** Available water tile types. */
 enum WaterTileType {
 	WATER_TILE_CLEAR, // Plain water.

src/widget_type.h

➞

Show inline comments

@@ @@ -11,12 +11,13 @@ @@
 #ifndef WIDGET_TYPE_H
 #define WIDGET_TYPE_H
 #include "core/alloc_type.hpp"
 #include "core/bitmath_func.hpp"
 #include "core/math_func.hpp"
 #include "strings_type.h"
 #include "gfx_type.h"
 #include "window_type.h"
 static const int WIDGET_LIST_END = -1; ///< indicate the end of widgets' list for vararg functions

src/window_gui.h

➞

Show inline comments

@@ @@ -9,13 +9,12 @@ @@
 /** @file window_gui.h Functions, definitions and such used only by the GUI. */
 #ifndef WINDOW_GUI_H
 #define WINDOW_GUI_H
 #include "core/math_func.hpp"
 #include "vehicle_type.h"
 #include "viewport_type.h"
 #include "company_type.h"
 #include "tile_type.h"
 #include "widget_type.h"

0 comments (0 inline, 0 general)