(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.

2006-08-22 14:38:37 +00:00 · 2006-08-22 14:38:37 +00:00 · 480af9c917
parent 5f4dbbd522
commit 480af9c917
97 changed files with 5385 additions and 5386 deletions
--- a/ai/default/default.c
+++ b/ai/default/default.c
@ -2729,7 +2729,8 @@ typedef struct AiRoadEnum {
 } AiRoadEnum;

 static const byte _dir_by_track[] = {
-	0,1,0,1,2,1, 0,0,
+	0, 1, 0, 1, 2, 1,
+	0, 0,
 	2, 3, 3, 2, 3, 0,
 };

--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@ -519,7 +519,7 @@ static const Widget _aircraft_view_widgets[] = {
 { WWT_PUSHIMGBTN,    RESIZE_LR,  14, 232, 249,  32,  49, SPR_CLONE_AIRCRAFT, STR_CLONE_AIRCRAFT_INFO },
 {      WWT_PANEL,   RESIZE_LRB,  14, 232, 249, 104, 103, 0x0,                STR_NULL },
 {  WWT_RESIZEBOX,  RESIZE_LRTB,  14, 238, 249, 104, 115, 0x0,                STR_NULL },
-{ WIDGETS_END }
+{   WIDGETS_END},
 };


--- a/airport_movement.h
+++ b/airport_movement.h
@ -38,7 +38,7 @@ static const AirportMovingData _airport_moving_data_country[22] = {
 	{  273,   49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 18 Fly around waiting for a landing spot (south)
 	{   44,   37, AMED_HELI_RAISE,                 0 }, // 19 Helicopter takeoff
 	{   44,   40, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 20 In position above landing spot helicopter
-	{ 44, 40,AMED_HELI_LOWER,0}										// 21 Helicopter landing
+	{   44,   40, AMED_HELI_LOWER,                 0 }, // 21 Helicopter landing
 };

 // Commuter Airfield (small) 5x4
@ -80,7 +80,7 @@ static const AirportMovingData _airport_moving_data_commuter[37] = {
 	{   64,   22, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 33 Go to position for Hangarentrance in air
 	{   64,   22, AMED_HELI_LOWER,                 0 }, // 34 Land in front of hangar
 	{   40,    8, AMED_EXACTPOS,                   0 }, // pre-helitakeoff helipad 1
-	{ 56, 8,AMED_EXACTPOS,0}			// pre-helitakeoff helipad 2
+	{   56,    8, AMED_EXACTPOS,                   0 }, // pre-helitakeoff helipad 2
 };

 // City Airport (large) 6x6
@ -109,7 +109,7 @@ static const AirportMovingData _airport_moving_data_town[25] = {
 	{  273,   49, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 21 Fly around waiting for a landing spot (south)
 	{   44,   63, AMED_HELI_RAISE,                 0 }, // 22 Helicopter takeoff
 	{   28,   74, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 23 In position above landing spot helicopter
-	{ 28, 74,AMED_HELI_LOWER,0}										// 24 Helicopter landing
+	{   28,   74, AMED_HELI_LOWER,                 0 }, // 24 Helicopter landing
 };

 // Metropolitan Airport (metropolitan) - 2 runways
@ -140,7 +140,7 @@ static const AirportMovingData _airport_moving_data_metropolitan[27] = {
 	{   44,   58, 0,                               0 }, // 23 Helicopter takeoff spot on ground (to clear airport sooner)
 	{   44,   63, AMED_HELI_RAISE,                 0 }, // 24 Helicopter takeoff
 	{   15,   54, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 25 Get in position above landing spot helicopter
-	{ 15, 54,AMED_HELI_LOWER,0}										// 26 Helicopter landing
+	{   15,   54, AMED_HELI_LOWER,                 0 }, // 26 Helicopter landing
 };

 // International Airport (international) - 2 runways, 6 terminals, dedicated helipod
--- a/command.h
+++ b/command.h
@ -140,10 +140,10 @@ enum {
 };

 enum {
-	DC_EXEC = 1,
-	DC_AUTO = 2,								// don't allow building on structures
-	DC_QUERY_COST = 4,					// query cost only, don't build.
-	DC_NO_WATER = 8,						// don't allow building on water
+	DC_EXEC            = 0x01,
+	DC_AUTO            = 0x02, // don't allow building on structures
+	DC_QUERY_COST      = 0x04, // query cost only,  don't build.
+	DC_NO_WATER        = 0x08, // don't allow building on water
 	DC_NO_RAIL_OVERLAP = 0x10, // don't allow overlap of rails (used in buildrail)
 	DC_AI_BUILDING     = 0x20, // special building rules for AI
 	DC_NO_TOWN_RATING  = 0x40, // town rating does not disallow you from building
@ -155,9 +155,9 @@ enum {
 #define CMD_MSG(x) ((x)<<16)

 enum {
-	CMD_AUTO = 0x200,
-	CMD_NO_WATER = 0x400,
-	CMD_NETWORK_COMMAND = 0x800,		// execute the command without sending it on the network
+	CMD_AUTO                  = 0x0200,
+	CMD_NO_WATER              = 0x0400,
+	CMD_NETWORK_COMMAND       = 0x0800, // execute the command without sending it on the network
 	CMD_NO_TEST_IF_IN_NETWORK = 0x1000, // When enabled, the command will bypass the no-DC_EXEC round if in network
 	CMD_SHOW_NO_ERROR         = 0x2000,
 };
--- a/industry_gui.c
+++ b/industry_gui.c
@ -135,11 +135,11 @@ static const Widget _build_industry_land1_widgets_extra[] = {
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    55,    66, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    68,    79, STR_024E_PRINTING_WORKS,        STR_0270_CONSTRUCT_PRINTING_WORKS},

-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    81+3,    92+3, STR_0240_COAL_MINE,	STR_CONSTRUCT_COAL_MINE_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    94+3,   105+3, STR_0243_FOREST,			STR_CONSTRUCT_FOREST_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    107+3,  118+3, STR_0248_FARM,				STR_CONSTRUCT_FARM_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    120+3,  131+3, STR_024A_OIL_WELLS,	STR_CONSTRUCT_OIL_WELLS_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    133+3,  144+3, STR_024F_GOLD_MINE,	STR_CONSTRUCT_GOLD_MINE_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    84,    95, STR_0240_COAL_MINE,             STR_CONSTRUCT_COAL_MINE_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    97,   108, STR_0243_FOREST,                STR_CONSTRUCT_FOREST_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   110,   121, STR_0248_FARM,                  STR_CONSTRUCT_FARM_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   123,   134, STR_024A_OIL_WELLS,             STR_CONSTRUCT_OIL_WELLS_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   136,   147, STR_024F_GOLD_MINE,             STR_CONSTRUCT_GOLD_MINE_TIP},
 {   WIDGETS_END},
 };

@ -154,13 +154,13 @@ static const Widget _build_industry_land2_widgets_extra[] = {
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    55,    66, STR_0246_FACTORY,               STR_0268_CONSTRUCT_FACTORY},
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    68,    79, STR_0254_WATER_TOWER,           STR_0277_CONSTRUCT_WATER_TOWER_CAN},

-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    81+3,    92+3, STR_024A_OIL_WELLS,STR_CONSTRUCT_OIL_WELLS_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    94+3,    105+3, STR_0255_DIAMOND_MINE,			STR_CONSTRUCT_DIAMOND_MINE_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    107+3,    118+3, STR_0256_COPPER_ORE_MINE,	STR_CONSTRUCT_COPPER_ORE_MINE_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    120+3,    131+3, STR_0248_FARM,		STR_CONSTRUCT_FARM_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    133+3,    144+3, STR_0251_FRUIT_PLANTATION,	STR_CONSTRUCT_FRUIT_PLANTATION_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    146+3,    157+3, STR_0252_RUBBER_PLANTATION,STR_CONSTRUCT_RUBBER_PLANTATION_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    159+3,    170+3, STR_0253_WATER_SUPPLY,			STR_CONSTRUCT_WATER_SUPPLY_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    84,    95, STR_024A_OIL_WELLS,             STR_CONSTRUCT_OIL_WELLS_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    97,   108, STR_0255_DIAMOND_MINE,          STR_CONSTRUCT_DIAMOND_MINE_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   110,   121, STR_0256_COPPER_ORE_MINE,       STR_CONSTRUCT_COPPER_ORE_MINE_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   123,   134, STR_0248_FARM,                  STR_CONSTRUCT_FARM_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   136,   147, STR_0251_FRUIT_PLANTATION,      STR_CONSTRUCT_FRUIT_PLANTATION_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   149,   160, STR_0252_RUBBER_PLANTATION,     STR_CONSTRUCT_RUBBER_PLANTATION_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   162,   173, STR_0253_WATER_SUPPLY,          STR_CONSTRUCT_WATER_SUPPLY_TIP},
 {   WIDGETS_END},
 };

@ -174,13 +174,13 @@ static const Widget _build_industry_land3_widgets_extra[] = {
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    42,    53, STR_025C_TOY_FACTORY,           STR_027F_CONSTRUCT_TOY_FACTORY},
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    55,    66, STR_025E_FIZZY_DRINK_FACTORY,   STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},

-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    68+3,    79+3, STR_0257_COTTON_CANDY_FOREST,STR_CONSTRUCT_COTTON_CANDY_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    81+3,    92+3, STR_0259_BATTERY_FARM,				STR_CONSTRUCT_BATTERY_FARM_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    94+3,    105+3, STR_025A_COLA_WELLS,				STR_CONSTRUCT_COLA_WELLS_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    107+3,    118+3, STR_025D_PLASTIC_FOUNTAINS,STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    120+3,    131+3, STR_025F_BUBBLE_GENERATOR,	STR_CONSTRUCT_BUBBLE_GENERATOR_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    133+3,    144+3, STR_0260_TOFFEE_QUARRY,		STR_CONSTRUCT_TOFFEE_QUARRY_TIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    146+3,    157+3, STR_0261_SUGAR_MINE,				STR_CONSTRUCT_SUGAR_MINE_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    71,    82, STR_0257_COTTON_CANDY_FOREST,   STR_CONSTRUCT_COTTON_CANDY_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    84,    95, STR_0259_BATTERY_FARM,          STR_CONSTRUCT_BATTERY_FARM_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,    97,   108, STR_025A_COLA_WELLS,            STR_CONSTRUCT_COLA_WELLS_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   110,   121, STR_025D_PLASTIC_FOUNTAINS,     STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   123,   134, STR_025F_BUBBLE_GENERATOR,      STR_CONSTRUCT_BUBBLE_GENERATOR_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   136,   147, STR_0260_TOFFEE_QUARRY,         STR_CONSTRUCT_TOFFEE_QUARRY_TIP},
+{    WWT_TEXTBTN,   RESIZE_NONE,    14,     2,   167,   149,   160, STR_0261_SUGAR_MINE,            STR_CONSTRUCT_SUGAR_MINE_TIP},
 {   WIDGETS_END},
 };

--- a/network.h
+++ b/network.h
@ -102,13 +102,13 @@ typedef struct NetworkPlayerInfo {
 } NetworkPlayerInfo;

 typedef struct NetworkClientInfo {
-	uint16 client_index;                          /// Index of the client (same as ClientState->index)
-	char client_name[NETWORK_CLIENT_NAME_LENGTH]; /// Name of the client
-	byte client_lang;                             /// The language of the client
-	byte client_playas;                           /// As which player is this client playing (PlayerID)
-	uint32 client_ip;                             /// IP-address of the client (so he can be banned)
-	Date join_date;                               /// Gamedate the player has joined
-	char unique_id[NETWORK_NAME_LENGTH];          /// Every play sends an unique id so we can indentify him
+	uint16 client_index;                            // Index of the client (same as ClientState->index)
+	char client_name[NETWORK_CLIENT_NAME_LENGTH];   // Name of the client
+	byte client_lang;                               // The language of the client
+	byte client_playas;                             // As which player is this client playing (PlayerID)
+	uint32 client_ip;                               // IP-address of the client (so he can be banned)
+	Date join_date;                                 // Gamedate the player has joined
+	char unique_id[NETWORK_NAME_LENGTH];            // Every play sends an unique id so we can indentify him
 } NetworkClientInfo;

 typedef struct NetworkGameList {
--- a/newgrf_cargo.c
+++ b/newgrf_cargo.c
@ -37,17 +37,13 @@ const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID] = {
 #define MC(cargo) (1 << cargo)
 const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE] =
 { /* LT_NORMAL: temperate */
-	MC(GC_PASSENGERS)|MC(GC_COAL)|MC(GC_MAIL)|MC(GC_OIL)|MC(GC_LIVESTOCK)|MC(GC_GOODS)|MC(GC_GRAIN)|MC(GC_WOOD)|
-	MC(GC_IRON_ORE)|MC(GC_STEEL)|MC(GC_VALUABLES),
+	MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL)  | MC(GC_OIL)   | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN)     | MC(GC_WOOD) | MC(GC_IRON_ORE)     | MC(GC_STEEL)      | MC(GC_VALUABLES),
 	/* LT_HILLY: arctic */
-	MC(GC_PASSENGERS)|MC(GC_COAL)|MC(GC_MAIL)|MC(GC_OIL)|MC(GC_LIVESTOCK)|MC(GC_GOODS)|
-	MC(GC_GRAIN)|MC(GC_WOOD)|MC(GC_VALUABLES)|MC(GC_PAPER)|MC(GC_FOOD),
+	MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL)  | MC(GC_OIL)   | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN)     | MC(GC_WOOD) | MC(GC_VALUABLES)    | MC(GC_PAPER)      | MC(GC_FOOD),
 	/* LT_DESERT: rainforest/desert */
-	MC(GC_PASSENGERS)|MC(GC_MAIL)|MC(GC_OIL)|MC(GC_GOODS)|MC(GC_GRAIN)|MC(GC_WOOD)|
-	MC(GC_VALUABLES)|MC(GC_FOOD)|MC(GC_FRUIT)|MC(GC_COPPER_ORE)|MC(GC_WATER)|MC(GC_RUBBER),
+	MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_OIL)   | MC(GC_GOODS) | MC(GC_GRAIN)     | MC(GC_WOOD)  | MC(GC_VALUABLES) | MC(GC_FOOD) | MC(GC_FRUIT)        | MC(GC_COPPER_ORE) | MC(GC_WATER)   | MC(GC_RUBBER),
 	/* LT_CANDY: toyland */
-	MC(GC_PASSENGERS)|MC(GC_MAIL)|MC(GC_SUGAR)|MC(GC_TOYS)|MC(GC_BATTERIES)|MC(GC_CANDY)|
-	MC(GC_TOFFEE)|MC(GC_COLA)|MC(GC_COTTON_CANDY)|MC(GC_BUBBLES)|MC(GC_PLASTIC)|MC(GC_FIZZY_DRINKS)
+	MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_SUGAR) | MC(GC_TOYS)  | MC(GC_BATTERIES) | MC(GC_CANDY) | MC(GC_TOFFEE)    | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES)    | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS)
 };
 /** END   --- TRANSLATE FROM GLOBAL CARGO TO LOCAL CARGO ID'S **/

--- a/news.h
+++ b/news.h
@ -51,9 +51,9 @@ enum NewsMode {
 };

 enum NewsFlags {
-	NF_VIEWPORT = 1,
-	NF_TILE = 4,
-	NF_VEHICLE = 8,
+	NF_VIEWPORT  = 0x01,
+	NF_TILE      = 0x04,
+	NF_VEHICLE   = 0x08,
 	NF_FORCE_BIG = 0x10,
 	NF_NOEXPIRE  = 0x20,
 	NF_INCOLOR   = 0x40,
--- a/openttd.h
+++ b/openttd.h
@ -337,22 +337,22 @@ typedef struct {


 enum {
-	WC_MAIN_WINDOW = 0x0,
-	WC_MAIN_TOOLBAR = 0x1,
-	WC_STATUS_BAR = 0x2,
-	WC_BUILD_TOOLBAR = 0x3,
-	WC_NEWS_WINDOW = 0x4,
-	WC_TOWN_DIRECTORY = 0x5,
-	WC_STATION_LIST = 0x6,
-	WC_TOWN_VIEW = 0x7,
-	WC_SMALLMAP = 0x8,
-	WC_TRAINS_LIST = 0x9,
-	WC_ROADVEH_LIST = 0xA,
-	WC_SHIPS_LIST = 0xB,
-	WC_AIRCRAFT_LIST = 0xC,
-	WC_VEHICLE_VIEW = 0xD,
-	WC_VEHICLE_DETAILS = 0xE,
-	WC_VEHICLE_REFIT = 0xF,
+	WC_MAIN_WINDOW              = 0x00,
+	WC_MAIN_TOOLBAR             = 0x01,
+	WC_STATUS_BAR               = 0x02,
+	WC_BUILD_TOOLBAR            = 0x03,
+	WC_NEWS_WINDOW              = 0x04,
+	WC_TOWN_DIRECTORY           = 0x05,
+	WC_STATION_LIST             = 0x06,
+	WC_TOWN_VIEW                = 0x07,
+	WC_SMALLMAP                 = 0x08,
+	WC_TRAINS_LIST              = 0x09,
+	WC_ROADVEH_LIST             = 0x0A,
+	WC_SHIPS_LIST               = 0x0B,
+	WC_AIRCRAFT_LIST            = 0x0C,
+	WC_VEHICLE_VIEW             = 0x0D,
+	WC_VEHICLE_DETAILS          = 0x0E,
+	WC_VEHICLE_REFIT            = 0x0F,
 	WC_VEHICLE_ORDERS           = 0x10,
 	WC_STATION_VIEW             = 0x11,
 	WC_VEHICLE_DEPOT            = 0x12,
--- a/pathfind.c
+++ b/pathfind.c
@ -115,12 +115,14 @@ static const byte _bits_mask[4] = {
 };

 static const byte _tpf_new_direction[14] = {
-	0,1,0,1,2,1, 0,0,
+	0, 1, 0, 1, 2, 1,
+	0, 0,
 	2, 3, 3, 2, 3, 0,
 };

 static const byte _tpf_prev_direction[14] = {
-	0,1,1,0,1,2, 0,0,
+	0, 1, 1, 0, 1, 2,
+	0, 0,
 	2, 3, 2, 3, 0, 3,
 };

--- a/rail.h
+++ b/rail.h
@ -105,13 +105,13 @@ typedef enum Trackdirs {
 /** These are a combination of tracks and directions. Values are 0-5 in one
 direction (corresponding to the Track enum) and 8-13 in the other direction. */
 typedef enum TrackdirBits {
-	TRACKDIR_BIT_NONE     = 0x0,
-	TRACKDIR_BIT_X_NE     = 0x1,
-	TRACKDIR_BIT_Y_SE     = 0x2,
-	TRACKDIR_BIT_UPPER_E  = 0x4,
-	TRACKDIR_BIT_LOWER_E  = 0x8,
-	TRACKDIR_BIT_LEFT_S   = 0x10,
-	TRACKDIR_BIT_RIGHT_S  = 0x20,
+	TRACKDIR_BIT_NONE     = 0x0000,
+	TRACKDIR_BIT_X_NE     = 0x0001,
+	TRACKDIR_BIT_Y_SE     = 0x0002,
+	TRACKDIR_BIT_UPPER_E  = 0x0004,
+	TRACKDIR_BIT_LOWER_E  = 0x0008,
+	TRACKDIR_BIT_LEFT_S   = 0x0010,
+	TRACKDIR_BIT_RIGHT_S  = 0x0020,
 	/* Again, note the two missing values here. This enables trackdir -> track conversion by doing (trackdir & 0xFF) */
 	TRACKDIR_BIT_X_SW     = 0x0100,
 	TRACKDIR_BIT_Y_NW     = 0x0200,
--- a/rail_gui.c
+++ b/rail_gui.c
@ -97,9 +97,9 @@ static void PlaceExtraDepotRail(TileIndex tile, uint16 extra)
 }

 static const uint16 _place_depot_extra[12] = {
-	0x604,		0x2102,		0x1202,		0x505,
+	0x0604, 0x2102, 0x1202, 0x0505,
 	0x2400, 0x2801, 0x1800, 0x1401,
-	0x2203,		0x904,		0x0A05,		0x1103,
+	0x2203, 0x0904, 0x0A05, 0x1103,
 };


--- a/station.h
+++ b/station.h
@ -98,10 +98,10 @@ struct Station {
 };

 enum {
-	FACIL_TRAIN = 1,
-	FACIL_TRUCK_STOP = 2,
-	FACIL_BUS_STOP = 4,
-	FACIL_AIRPORT = 8,
+	FACIL_TRAIN      = 0x01,
+	FACIL_TRUCK_STOP = 0x02,
+	FACIL_BUS_STOP   = 0x04,
+	FACIL_AIRPORT    = 0x08,
 	FACIL_DOCK       = 0x10,
 };

--- a/vehicle.h
+++ b/vehicle.h
@ -8,7 +8,7 @@
 #include "rail.h"

 enum {
-	VEH_Invalid = 0,
+	VEH_Invalid  = 0x00,
 	VEH_Train    = 0x10,
 	VEH_Road     = 0x11,
 	VEH_Ship     = 0x12,
@ -18,10 +18,10 @@ enum {
 } ;

 enum VehStatus {
-	VS_HIDDEN = 1,
-	VS_STOPPED = 2,
-	VS_UNCLICKABLE = 4,
-	VS_DEFPAL = 0x8,
+	VS_HIDDEN          = 0x01,
+	VS_STOPPED         = 0x02,
+	VS_UNCLICKABLE     = 0x04,
+	VS_DEFPAL          = 0x08,
 	VS_TRAIN_SLOWING   = 0x10,
 	VS_SHADOW          = 0x20,
 	VS_AIRCRAFT_BROKEN = 0x40,
--- a/viewport.h
+++ b/viewport.h
@ -72,7 +72,7 @@ void VpSelectTilesWithMethod(int x, int y, int method);

 // highlighting draw styles
 enum {
-	HT_NONE = 0,
+	HT_NONE   = 0x00,
 	HT_RECT   = 0x80,
 	HT_POINT  = 0x40,
 	HT_LINE   = 0x20, /* used for autorail highlighting (longer streches)