Mercurial > hg > openttd

changeset 3494:caad4242e482 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r4345) -Codechange: Similar to airport tiles, rename _industry_map5_ arrays to _industry_sections
author celestar <celestar@openttd.org>
date Mon, 10 Apr 2006 14:27:26 +0000
parents 4662ea9f4f4a
children 2ed3703642c2
files industry_cmd.c table/build_industry.h table/industry_land.h
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -414,13 +414,13 @@
 	uint gfx = GetIndustryGfx(tile);
 	CargoID a;
 
-	a = _industry_map5_accepts_1[gfx];
+	a = _industry_section_accepts_1[gfx];
 	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;
 
-	a = _industry_map5_accepts_3[gfx];
+	a = _industry_section_accepts_3[gfx];
 	if (a != CT_INVALID) ac[a] = 8;
 }
 
@@ -482,7 +482,7 @@
 		am = MoveGoodsToStation(i->xy, i->width, i->height, i->produced_cargo[0], cw);
 		i->last_mo_transported[0] += am;
 		if (am != 0) {
-			uint newgfx = _industry_produce_map5[GetIndustryGfx(tile)];
+			uint newgfx = _industry_produce_section[GetIndustryGfx(tile)];
 
 			if (newgfx != 0xFF) {
 				_m[tile].m1 = 0x80;
@@ -756,7 +756,7 @@
 
 	TransportIndustryGoods(tile);
 
-	newgfx = _industry_map5_animation_next[GetIndustryGfx(tile)];
+	newgfx = _industry_section_animation_next[GetIndustryGfx(tile)];
 	if (newgfx != 255) {
 		_m[tile].m1 = 0;
 		SetIndustryGfx(tile, newgfx);
@@ -1259,7 +1259,7 @@
 	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,
@@ -1316,7 +1316,7 @@
 
 				if (tileh != 0) {
 					int t;
-					byte bits = _industry_map5_bits[it->gfx];
+					byte bits = _industry_section_bits[it->gfx];
 
 					if (bits & 0x10) return false;
 
--- a/table/build_industry.h
+++ b/table/build_industry.h
@@ -1226,7 +1226,7 @@
 
 #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,
 	PAS, INV, INV, PAS, PAS, PAS, INV, INV,
 	INV, INV, INV, INV, INV, INV, INV, PAS,
@@ -1252,7 +1252,7 @@
 };
 
 
-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,
@@ -1277,7 +1277,7 @@
 	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,
 	COL, INV, INV, INV, INV, WOD, INV, INV,
 	INV, INV, INV, INV, OIL, INV, INV, INV,
--- a/table/industry_land.h
+++ b/table/industry_land.h
@@ -887,7 +887,7 @@
 
 /* next frame in an animation */
 #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, 16, N, N, N, N, N, N,
@@ -913,7 +913,7 @@
 };
 
 /* 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,
 17, N, N, N, N, N, N, N,