mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections

release/0.5
celestar 2006-04-10 14:27:26 +00:00
parent 7a3345f4df
commit eae5fcc455
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
industry_cmd.c
View File

@ -414,13 +414,13 @@ static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac)
uint gfx = GetIndustryGfx(tile); uint gfx = GetIndustryGfx(tile);
CargoID a; CargoID a;
a = _industry_map5_accepts_1[gfx]; a = _industry_section_accepts_1[gfx];
if (a != CT_INVALID) ac[a] = (a == 0) ? 1 : 8; if (a != CT_INVALID) ac[a] = (a == 0) ? 1 : 8;
a = _industry_map5_accepts_2[gfx]; a = _industry_section_accepts_2[gfx];
if (a != CT_INVALID) ac[a] = 8; if (a != CT_INVALID) ac[a] = 8;
a = _industry_map5_accepts_3[gfx]; a = _industry_section_accepts_3[gfx];
if (a != CT_INVALID) ac[a] = 8; if (a != CT_INVALID) ac[a] = 8;
} }
@ -482,7 +482,7 @@ static void TransportIndustryGoods(TileIndex tile)
am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw); am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw);
i->last_mo_transported[0] += am; i->last_mo_transported[0] += am;
if (am != 0) { if (am != 0) {
uint newgfx = _industry_produce_map5[GetIndustryGfx(tile)]; uint newgfx = _industry_produce_section[GetIndustryGfx(tile)];
if (newgfx != 0xFF) { if (newgfx != 0xFF) {
_m[tile].m1 = 0x80; _m[tile].m1 = 0x80;
@ -756,7 +756,7 @@ static void TileLoop_Industry(TileIndex tile)
TransportIndustryGoods(tile); TransportIndustryGoods(tile);
newgfx = _industry_map5_animation_next[GetIndustryGfx(tile)]; newgfx = _industry_section_animation_next[GetIndustryGfx(tile)];
if (newgfx != 255) { if (newgfx != 255) {
_m[tile].m1 = 0; _m[tile].m1 = 0;
SetIndustryGfx(tile, newgfx); SetIndustryGfx(tile, newgfx);
@ -1259,7 +1259,7 @@ static const Town* CheckMultipleIndustryInTown(TileIndex tile, int type)
return t; return t;
} }
static const byte _industry_map5_bits[] = { static const byte _industry_section_bits[] = {
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
@ -1316,7 +1316,7 @@ static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable*
if (tileh != 0) { if (tileh != 0) {
int t; int t;
byte bits = _industry_map5_bits[it->gfx]; byte bits = _industry_section_bits[it->gfx];
if (bits & 0x10) return false; if (bits & 0x10) return false;

6
table/build_industry.h
View File

@ -1226,7 +1226,7 @@ static const byte * const _industry_create_table[4] = {
#define INV CT_INVALID #define INV CT_INVALID
static const CargoID _industry_map5_accepts_1[] = { static const CargoID _industry_section_accepts_1[] = {
INV, INV, INV, PAS, INV, INV, INV, INV, INV, INV, INV, PAS, INV, INV, INV, INV,
PAS, INV, INV, PAS, PAS, PAS, INV, INV, PAS, INV, INV, PAS, PAS, PAS, INV, INV,
INV, INV, INV, INV, INV, INV, INV, PAS, INV, INV, INV, INV, INV, INV, INV, PAS,
@ -1252,7 +1252,7 @@ static const CargoID _industry_map5_accepts_1[] = {
}; };
static const CargoID _industry_map5_accepts_2[] = { static const CargoID _industry_section_accepts_2[] = {
INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV,
INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV,
INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV,
@ -1277,7 +1277,7 @@ static const CargoID _industry_map5_accepts_2[] = {
INV, INV, INV, INV, INV, INV, INV INV, INV, INV, INV, INV, INV, INV
}; };
static const CargoID _industry_map5_accepts_3[] = { static const CargoID _industry_section_accepts_3[] = {
INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV, INV,
COL, INV, INV, INV, INV, WOD, INV, INV, COL, INV, INV, INV, INV, WOD, INV, INV,
INV, INV, INV, INV, OIL, INV, INV, INV, INV, INV, INV, INV, OIL, INV, INV, INV,

4
table/industry_land.h
View File

@ -887,7 +887,7 @@ static const byte _coal_plant_sparks_y[] = {23, 11, 6, 3, 1, 0};
/* next frame in an animation */ /* next frame in an animation */
#define N 255 #define N 255
static const byte _industry_map5_animation_next[] = { static const byte _industry_section_animation_next[] = {
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
N, 16, N, N, N, N, N, N, N, 16, N, N, N, N, N, N,
@ -913,7 +913,7 @@ N, N, N, N, N, N, N,
}; };
/* animation to start when goods is produced */ /* animation to start when goods is produced */
static const byte _industry_produce_map5[] = { static const byte _industry_produce_section[] = {
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
17, N, N, N, N, N, N, N, 17, N, N, N, N, N, N, N,