Changeset - r8103:aabc526ce61d
[Not reviewed]
master
0 11 0
rubidium - 16 years ago 2007-12-18 20:58:12
rubidium@openttd.org
(svn r11664) -Codechange: use more specific ("rail_type.h" instead of "rail.h" that includes way more than only "rail_type.h") includes at some places.
11 files changed with 11 insertions and 8 deletions:
0 comments (0 inline, 0 general)
src/autoreplace_gui.cpp
Show inline comments
 
@@ -7,24 +7,25 @@
 
#include "debug.h"
 
#include "functions.h"
 
#include "table/sprites.h"
 
#include "table/strings.h"
 
#include "strings.h"
 
#include "window.h"
 
#include "gui.h"
 
#include "command.h"
 
#include "variables.h"
 
#include "vehicle_gui.h"
 
#include "newgrf_engine.h"
 
#include "group.h"
 
#include "rail.h"
 

	
 

	
 
static RailType _railtype_selected_in_replace_gui;
 

	
 
static bool _rebuild_left_list;
 
static bool _rebuild_right_list;
 

	
 
static const StringID _rail_types_list[] = {
 
	STR_RAIL_VEHICLES,
 
	STR_ELRAIL_VEHICLES,
 
	STR_MONORAIL_VEHICLES,
 
	STR_MAGLEV_VEHICLES,
src/bridge_map.h
Show inline comments
 
/* $Id$ */
 

	
 
/** @file bridge_map.h Map accessor functions for bridges. */
 

	
 
#ifndef BRIDGE_MAP_H
 
#define BRIDGE_MAP_H
 

	
 
#include "direction_func.h"
 
#include "macros.h"
 
#include "map.h"
 
#include "rail.h"
 
#include "rail_type.h"
 
#include "road_map.h"
 
#include "tile.h"
 

	
 

	
 
/**
 
 * Checks if this is a bridge, instead of a tunnel
 
 * @param t The tile to analyze
 
 * @pre IsTileType(t, MP_TUNNELBRIDGE)
 
 * @return true if the structure is a bridge one
 
 */
 
static inline bool IsBridge(TileIndex t)
 
{
src/elrail.cpp
Show inline comments
 
@@ -44,25 +44,25 @@
 
 * <img src="../../elrail_track.png">
 
 *
 
 */
 

	
 
#include "stdafx.h"
 
#include "openttd.h"
 
#include "station_map.h"
 
#include "tile.h"
 
#include "viewport.h"
 
#include "functions.h" /* We should REALLY get rid of this goddamn file, as it is butt-ugly */
 
#include "variables.h" /* ... same here */
 
#include "landscape.h"
 
#include "rail.h"
 
#include "rail_type.h"
 
#include "debug.h"
 
#include "tunnel_map.h"
 
#include "road_map.h"
 
#include "bridge_map.h"
 
#include "bridge.h"
 
#include "rail_map.h"
 
#include "table/sprites.h"
 
#include "table/elrail_data.h"
 
#include "vehicle.h"
 
#include "train.h"
 
#include "gui.h"
 
#include "transparency.h"
src/engine.h
Show inline comments
 
/* $Id$ */
 

	
 
/** @file engine.h */
 

	
 
#ifndef ENGINE_H
 
#define ENGINE_H
 

	
 
#include "oldpool.h"
 
#include "rail.h"
 
#include "rail_type.h"
 
#include "sound.h"
 
#include "vehicle.h"
 

	
 
enum RailVehicleTypes {
 
	RAILVEH_SINGLEHEAD,  ///< indicates a "standalone" locomotive
 
	RAILVEH_MULTIHEAD,   ///< indicates a combination of two locomotives
 
	RAILVEH_WAGON,       ///< simple wagon, not motorized
 
};
 

	
 
enum EngineClass {
 
	EC_STEAM,
 
	EC_DIESEL,
src/newgrf.cpp
Show inline comments
 
@@ -39,24 +39,25 @@
 
#include "helpers.hpp"
 
#include "table/town_land.h"
 
#include "cargotype.h"
 
#include "industry.h"
 
#include "newgrf_canal.h"
 
#include "table/build_industry.h"
 
#include "newgrf_commons.h"
 
#include "newgrf_townname.h"
 
#include "newgrf_industries.h"
 
#include "table/landscape_sprite.h"
 
#include "gfxinit.h"
 
#include "fios.h"
 
#include "rail.h"
 

	
 
/* TTDPatch extended GRF format codec
 
 * (c) Petr Baudis 2004 (GPL'd)
 
 * Changes by Florian octo Forster are (c) by the OpenTTD development team.
 
 *
 
 * Contains portions of documentation by TTDPatch team.
 
 * Thanks especially to Josef Drexler for the documentation as well as a lot
 
 * of help at #tycoon. Also thanks to Michael Blunck for is GRF files which
 
 * served as subject to the initial testing of this codec. */
 

	
 

	
 
static int _skip_sprites; // XXX
src/newgrf_house.cpp
Show inline comments
 
/* $Id$ */
 

	
 
/** @file newgrf_house.cpp */
 

	
 
#include "stdafx.h"
 
#include "openttd.h"
 
#include "functions.h"
 
#include "variables.h"
 
#include "debug.h"
 
#include "viewport.h"
 
#include "landscape.h"
 
#include "date.h"
 
#include "tile.h"
 
#include "town.h"
 
#include "town_map.h"
 
#include "sound.h"
 
#include "sprite.h"
 
#include "strings.h"
 
#include "table/strings.h"
 
#include "table/sprites.h"
 
#include "table/town_land.h"
 
#include "newgrf.h"
 
#include "newgrf_house.h"
 
#include "newgrf_spritegroup.h"
 
#include "newgrf_callbacks.h"
src/pathfind.cpp
Show inline comments
 
@@ -3,25 +3,25 @@
 
/** @file pathfind.cpp */
 

	
 
#include "stdafx.h"
 
#include "openttd.h"
 
#include "bridge_map.h"
 
#include "station_map.h"
 
#include "depot.h"
 
#include "functions.h"
 
#include "landscape.h"
 
#include "map.h"
 
#include "tile.h"
 
#include "pathfind.h"
 
#include "rail.h"
 
#include "rail_type.h"
 
#include "debug.h"
 
#include "tunnel_map.h"
 
#include "variables.h"
 
#include "depot.h"
 
#include "tunnelbridge_map.h"
 

	
 
/* remember which tiles we have already visited so we don't visit them again. */
 
static bool TPFSetTileBit(TrackPathFinder *tpf, TileIndex tile, int dir)
 
{
 
	uint hash, val, offs;
 
	TrackPathFinderLink *link, *new_link;
 
	uint bits = 1 << dir;
src/player.h
Show inline comments
 
/* $Id$ */
 

	
 
/** @file player.h */
 

	
 
#ifndef PLAYER_H
 
#define PLAYER_H
 

	
 
#include "oldpool.h"
 
#include "aystar.h"
 
#include "rail.h"
 
#include "rail_type.h"
 
#include "road_func.h"
 
#include "engine.h"
 
#include "livery.h"
 
#include "genworld.h"
 
#include "gfx.h"
 

	
 
struct PlayerEconomyEntry {
 
	Money income;
 
	Money expenses;
 
	int32 delivered_cargo;
 
	int32 performance_history; ///< player score (scale 0-1000)
 
	Money company_value;
src/track_func.h
Show inline comments
 
@@ -505,13 +505,13 @@ static inline bool IsReversingRoadTrackd
 
}
 

	
 
/**
 
 * Checks whether the given trackdir is a straight road
 
 * @param dir the trackdir to check
 
 * @return true if it is a straight road trackdir
 
 */
 
static inline bool IsStraightRoadTrackdir(Trackdir dir)
 
{
 
	return (dir & 0x06) == 0;
 
}
 

	
 
#endif /* RAIL_H */
 
#endif /* TRACK_FUNC_H */
src/track_type.h
Show inline comments
 
@@ -113,13 +113,13 @@ enum TrackdirBits {
 
	TRACKDIR_BIT_LOWER_W  = 0x0800, ///< Track lower, direction west
 
	TRACKDIR_BIT_LEFT_N   = 0x1000, ///< Track left, direction north
 
	TRACKDIR_BIT_RIGHT_N  = 0x2000, ///< Track right, direction north
 
	TRACKDIR_BIT_MASK     = 0x3F3F, ///< Bitmask for bit-operations
 
	INVALID_TRACKDIR_BIT  = 0xFFFF, ///< Flag for an invalid trackdirbit value
 
};
 

	
 
/** Define basic enum properties */
 
template <> struct EnumPropsT<TrackdirBits> : MakeEnumPropsT<TrackdirBits, uint16, TRACKDIR_BIT_NONE, TRACKDIR_BIT_MASK, INVALID_TRACKDIR_BIT> {};
 
typedef TinyEnumT<TrackdirBits> TrackdirBitsShort;
 
DECLARE_ENUM_AS_BIT_SET(TrackdirBits);
 

	
 
#endif /* RAIL_H */
 
#endif /* TRACK_TYPE_H */
src/vehicle.cpp
Show inline comments
 
@@ -19,25 +19,25 @@
 
#include "gfx.h"
 
#include "viewport.h"
 
#include "news.h"
 
#include "command.h"
 
#include "saveload.h"
 
#include "player.h"
 
#include "engine.h"
 
#include "sound.h"
 
#include "debug.h"
 
#include "vehicle_gui.h"
 
#include "depot.h"
 
#include "station.h"
 
#include "rail.h"
 
#include "rail_type.h"
 
#include "train.h"
 
#include "aircraft.h"
 
#include "industry_map.h"
 
#include "station_map.h"
 
#include "water_map.h"
 
#include "network/network.h"
 
#include "yapf/yapf.h"
 
#include "date.h"
 
#include "newgrf_callbacks.h"
 
#include "newgrf_engine.h"
 
#include "newgrf_sound.h"
 
#include "helpers.hpp"
0 comments (0 inline, 0 general)