(svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there.
authorbelugas
Sun, 29 Oct 2006 00:39:41 +0000
changeset 4995 e6152c0dc612
parent 4994 ec6d8b5551f4
child 4996 c20caeeb1aed
(svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there.
-Codechange: _industry_type_cost is not defined, remove its declaration
industry_gui.c
table/build_industry.h
--- a/industry_gui.c	Sat Oct 28 23:47:00 2006 +0000
+++ b/industry_gui.c	Sun Oct 29 00:39:41 2006 +0000
@@ -17,9 +17,12 @@
 #include "town.h"
 #include "variables.h"
 
-/* Present in table/build_industry.h" */
-extern const byte _build_industry_types[4][12];
-extern const byte _industry_type_costs[37];
+const byte _build_industry_types[4][12] = {
+	{  1,  2,  4,  6,  8,  0,  3,  5,  9, 11, 18 },
+	{  1, 14,  4, 13,  7,  0,  3,  9, 11, 15 },
+	{ 25, 13,  4, 23, 22, 11, 17, 10, 24, 19, 20, 21 },
+	{ 27, 30, 31, 33, 26, 28, 29, 32, 34, 35, 36 },
+};
 
 static void UpdateIndustryProduction(Industry *i);
 
--- a/table/build_industry.h	Sat Oct 28 23:47:00 2006 +0000
+++ b/table/build_industry.h	Sun Oct 29 00:39:41 2006 +0000
@@ -1391,13 +1391,6 @@
 };
 #undef MK
 
-const byte _build_industry_types[4][12] = {
-	{  1,  2,  4,  6,  8,  0,  3,  5,  9, 11, 18 },
-	{  1, 14,  4, 13,  7,  0,  3,  9, 11, 15 },
-	{ 25, 13,  4, 23, 22, 11, 17, 10, 24, 19, 20, 21 },
-	{ 27, 30, 31, 33, 26, 28, 29, 32, 34, 35, 36 },
-};
-
 
 static const byte _industry_create_table_0[] = {
 	4, 4,