dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r9672) -Cleanup: lots of coding style fixes around operands.

Browse Source
This commit is contained in:
rubidium
2007-04-18 22:10:36 +00:00
parent 41cf2fa69b
commit 80c259f64f
62 changed files with 1051 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/table/ai_rail.h
View File

@@ -21,7 +21,7 @@ struct AiDefaultRoadBlock {
};
#define MKHDR(a,b,c,d,e) a,b,c,d,e,
#define MKHDR(a, b, c, d, e) a, b, c, d, e,
#define MKDEPOT(a, b, c) {0, a, {b, c}}
#define MKSTATION(a, b, c) {1, a, {b, c}}
#define MKRAIL(a, b, c) {2, a, {b, c}}
@@ -424,17 +424,17 @@ static const AiDefaultRailBlock * const _default_rail_track_data[] = {
#undef MKHDR
#define MKHDR(a) a,{
#define MKHDR(a) a, {
static const AiDefaultBlockData _roaddata_ai_0_data[] = {
MKDEPOT(2, -1,1),
MKSTATION(0x2, -1,0),
MKRAIL(0xC, 0,0),
MKRAIL(0x9, 0,1),
MKCLRRAIL(0, 0,-1),
MKCLRRAIL(0, 1,0),
MKCLRRAIL(0, 1,1),
MKCLRRAIL(0, 0,2),
MKDEPOT(2, -1, 1),
MKSTATION(0x2, -1, 0),
MKRAIL(0xC, 0, 0),
MKRAIL(0x9, 0, 1),
MKCLRRAIL(0, 0, -1),
MKCLRRAIL(0, 1, 0),
MKCLRRAIL(0, 1, 1),
MKCLRRAIL(0, 0, 2),
MKEND
};
@@ -443,14 +443,14 @@ static const AiDefaultRoadBlock _roaddata_ai_0 = {
};
static const AiDefaultBlockData _roaddata_ai_1_data[] = {
MKDEPOT(1, 0,-1),
MKSTATION(0x1, 1,-1),
MKRAIL(0x3, 0,0),
MKRAIL(0x9, 1,0),
MKCLRRAIL(0, -1,0),
MKCLRRAIL(0, 0,1),
MKCLRRAIL(0, 1,1),
MKCLRRAIL(0, 2,0),
MKDEPOT(1, 0, -1),
MKSTATION(0x1, 1, -1),
MKRAIL(0x3, 0, 0),
MKRAIL(0x9, 1, 0),
MKCLRRAIL(0, -1, 0),
MKCLRRAIL(0, 0, 1),
MKCLRRAIL(0, 1, 1),
MKCLRRAIL(0, 2, 0),
MKEND
};
@@ -459,14 +459,14 @@ static const AiDefaultRoadBlock _roaddata_ai_1 = {
};
static const AiDefaultBlockData _roaddata_ai_2_data[] = {
MKDEPOT(3, 1,1),
MKSTATION(0x3, 0,1),
MKRAIL(0x6, 0,0),
MKRAIL(0xC, 1,0),
MKCLRRAIL(0, -1,0),
MKCLRRAIL(0, 0,-1),
MKCLRRAIL(0, 1,-1),
MKCLRRAIL(0, 2,0),
MKDEPOT(3, 1, 1),
MKSTATION(0x3, 0, 1),
MKRAIL(0x6, 0, 0),
MKRAIL(0xC, 1, 0),
MKCLRRAIL(0, -1, 0),
MKCLRRAIL(0, 0, -1),
MKCLRRAIL(0, 1, -1),
MKCLRRAIL(0, 2, 0),
MKEND
};
@@ -475,14 +475,14 @@ static const AiDefaultRoadBlock _roaddata_ai_2 = {
};
static const AiDefaultBlockData _roaddata_ai_3_data[] = {
MKDEPOT(0, 1,0),
MKSTATION(0x0, 1,1),
MKRAIL(0x6, 0,0),
MKRAIL(0x3, 0,1),
MKCLRRAIL(0, 0,-1),
MKCLRRAIL(0, -1,0),
MKCLRRAIL(0, -1,1),
MKCLRRAIL(0, 0,2),
MKDEPOT(0, 1, 0),
MKSTATION(0x0, 1, 1),
MKRAIL(0x6, 0, 0),
MKRAIL(0x3, 0, 1),
MKCLRRAIL(0, 0, -1),
MKCLRRAIL(0, -1, 0),
MKCLRRAIL(0, -1, 1),
MKCLRRAIL(0, 0, 2),
MKEND
};
@@ -491,11 +491,11 @@ static const AiDefaultRoadBlock _roaddata_ai_3 = {
};
static const AiDefaultBlockData _roaddata_ai_4_data[] = {
MKSTATION(0x2, -1,0),
MKRAIL(0x8, 0,0),
MKCLRRAIL(0, 0,-1),
MKCLRRAIL(0, 1,0),
MKCLRRAIL(0, 0,1),
MKSTATION(0x2, -1, 0),
MKRAIL(0x8, 0, 0),
MKCLRRAIL(0, 0, -1),
MKCLRRAIL(0, 1, 0),
MKCLRRAIL(0, 0, 1),
MKEND
};
@@ -504,11 +504,11 @@ static const AiDefaultRoadBlock _roaddata_ai_4 = {
};
static const AiDefaultBlockData _roaddata_ai_5_data[] = {
MKSTATION(0x3, 0,1),
MKRAIL(0x4, 0,0),
MKCLRRAIL(0, -1,0),
MKCLRRAIL(0, 0,-1),
MKCLRRAIL(0, 1,0),
MKSTATION(0x3, 0, 1),
MKRAIL(0x4, 0, 0),
MKCLRRAIL(0, -1, 0),
MKCLRRAIL(0, 0, -1),
MKCLRRAIL(0, 1, 0),
MKEND
};
@@ -517,11 +517,11 @@ static const AiDefaultRoadBlock _roaddata_ai_5 = {
};
static const AiDefaultBlockData _roaddata_ai_6_data[] = {
MKSTATION(0x0, 1,1),
MKRAIL(0x2, 0,1),
MKCLRRAIL(0, 0,0),
MKCLRRAIL(0, -1,0),
MKCLRRAIL(0, 0,2),
MKSTATION(0x0, 1, 1),
MKRAIL(0x2, 0, 1),
MKCLRRAIL(0, 0, 0),
MKCLRRAIL(0, -1, 0),
MKCLRRAIL(0, 0, 2),
MKEND
};
@@ -530,11 +530,11 @@ static const AiDefaultRoadBlock _roaddata_ai_6 = {
};
static const AiDefaultBlockData _roaddata_ai_7_data[] = {
MKSTATION(0x1, 1,-1),
MKRAIL(0x1, 1,0),
MKCLRRAIL(0, 0,0),
MKCLRRAIL(0, 1,1),
MKCLRRAIL(0, 2,0),
MKSTATION(0x1, 1, -1),
MKRAIL(0x1, 1, 0),
MKCLRRAIL(0, 0, 0),
MKCLRRAIL(0, 1, 1),
MKCLRRAIL(0, 2, 0),
MKEND
};

1294
src/table/build_industry.h
View File

File diff suppressed because it is too large Load Diff

2
src/table/namegen.h
View File

@@ -1931,7 +1931,7 @@ static const char *name_czech_suffix[] = {
static const char *name_romanian_real[]= {
static const char *name_romanian_real[] = {
"Adjud",
"Alba Iulia",
"Alexandria",

8
src/table/station_land.h
View File

@@ -34,7 +34,7 @@ static const DrawTileSeqStruct _station_display_datas_4[] = {
{ 0, 0, 0, 16, 5, 7, SPR_RAIL_PLATFORM_PILLARS_X_REAR | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_FRONT | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_X_TILE_A | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0,(byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_X_TILE_A | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
{ 0, 0, (byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_X_TILE_A | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
TILE_SEQ_END()
};
@@ -42,7 +42,7 @@ static const DrawTileSeqStruct _station_display_datas_5[] = {
{ 0, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_PILLARS_Y_REAR | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 11, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_FRONT | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_Y_TILE_A | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0,(byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_Y_TILE_A | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
{ 0, 0, (byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_Y_TILE_A | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
TILE_SEQ_END()
};
@@ -50,7 +50,7 @@ static const DrawTileSeqStruct _station_display_datas_6[] = {
{ 0, 0, 0, 16, 5, 2, SPR_RAIL_PLATFORM_X_REAR | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 11, 0, 16, 5, 2, SPR_RAIL_PLATFORM_PILLARS_X_FRONT | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_X_TILE_B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0,(byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_X_TILE_B | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
{ 0, 0, (byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_X_TILE_B | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
TILE_SEQ_END()
};
@@ -58,7 +58,7 @@ static const DrawTileSeqStruct _station_display_datas_7[] = {
{ 0, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_Y_REAR | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 11, 0, 0, 5, 16, 2, SPR_RAIL_PLATFORM_PILLARS_Y_FRONT | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0, 16, 16, 16, 10, SPR_RAIL_ROOF_STRUCTURE_Y_TILE_B | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE },
{ 0, 0,(byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_Y_TILE_B | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
{ 0, 0, (byte)0x80, 0, 0, 0, SPR_RAIL_ROOF_GLASS_Y_TILE_B | (1 << PALETTE_MODIFIER_TRANSPARENT), PALETTE_TO_TRANSPARENT },
TILE_SEQ_END()
};

2
src/table/tree_land.h
View File

@@ -25,7 +25,7 @@ static const TreePos _tree_layout_xy[][4] = {
{ { 3, 9 }, { 8, 2 }, { 9, 9 }, { 1, 5 } }
};
static const PalSpriteID _tree_layout_sprite[164+(79-48+1)][4] = {
static const PalSpriteID _tree_layout_sprite[164 + (79 - 48 + 1)][4] = {
{ { 0x652, PAL_NONE }, { 0x659, PAL_NONE }, { 0x660, PAL_NONE }, { 0x667, PAL_NONE } }, /* 0 */
{ { 0x652, PAL_NONE }, { 0x667, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x675, PAL_NONE } }, /* 1 */
{ { 0x652, PAL_NONE }, { 0x66e, PAL_NONE }, { 0x659, PAL_NONE }, { 0x675, PAL_NONE } }, /* 2 */