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

1 files changed, 647 insertions, 647 deletions

diff --git a/src/table/build_industry.h b/src/table/build_industry.h
index d7bfbfd37..1b178b625 100644
--- a/src/table/build_industry.h
+++ b/src/table/build_industry.h
@@ -5,54 +5,54 @@
 #ifndef BUILD_INDUSTRY_H
 #define BUILD_INDUSTRY_H
 
-#define MK(x,y, m) {{x, y}, m}
+#define MK(x, y, m) {{x, y}, m}
 
 #define MKEND {{-0x80, 0}, 0}
 
 static const IndustryTileTable _tile_table_coal_mine_0[] = {
-	MK(1,1, 0),
-	MK(1,2, 2),
-	MK(0,0, 5),
-	MK(1,0, 6),
-	MK(2,0, 3),
-	MK(2,2, 3),
+	MK(1, 1, 0),
+	MK(1, 2, 2),
+	MK(0, 0, 5),
+	MK(1, 0, 6),
+	MK(2, 0, 3),
+	MK(2, 2, 3),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_coal_mine_1[] = {
-	MK(1,1, 0),
-	MK(1,2, 2),
-	MK(2,0, 0),
-	MK(2,1, 2),
-	MK(1,0, 3),
-	MK(0,0, 3),
-	MK(0,1, 4),
-	MK(0,2, 4),
-	MK(2,2, 4),
+	MK(1, 1, 0),
+	MK(1, 2, 2),
+	MK(2, 0, 0),
+	MK(2, 1, 2),
+	MK(1, 0, 3),
+	MK(0, 0, 3),
+	MK(0, 1, 4),
+	MK(0, 2, 4),
+	MK(2, 2, 4),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_coal_mine_2[] = {
-	MK(0,0, 0),
-	MK(0,1, 2),
-	MK(0,2, 5),
-	MK(1,0, 3),
-	MK(1,1, 3),
-	MK(1,2, 6),
+	MK(0, 0, 0),
+	MK(0, 1, 2),
+	MK(0, 2, 5),
+	MK(1, 0, 3),
+	MK(1, 1, 3),
+	MK(1, 2, 6),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_coal_mine_3[] = {
-	MK(0,1, 0),
-	MK(0,2, 2),
-	MK(0,3, 4),
-	MK(1,0, 5),
-	MK(1,1, 0),
-	MK(1,2, 2),
-	MK(1,3, 3),
-	MK(2,0, 6),
-	MK(2,1, 4),
-	MK(2,2, 3),
+	MK(0, 1, 0),
+	MK(0, 2, 2),
+	MK(0, 3, 4),
+	MK(1, 0, 5),
+	MK(1, 1, 0),
+	MK(1, 2, 2),
+	MK(1, 3, 3),
+	MK(2, 0, 6),
+	MK(2, 1, 4),
+	MK(2, 2, 3),
 	MKEND
 };
 
@@ -64,36 +64,36 @@ static const IndustryTileTable * const _tile_table_coal_mine[] = {
 };
 
 static const IndustryTileTable _tile_table_power_station_0[] = {
-	MK(0,0, 7),
-	MK(0,1, 9),
-	MK(1,0, 7),
-	MK(1,1, 8),
-	MK(2,0, 7),
-	MK(2,1, 8),
-	MK(3,0, 10),
-	MK(3,1, 10),
+	MK(0, 0, 7),
+	MK(0, 1, 9),
+	MK(1, 0, 7),
+	MK(1, 1, 8),
+	MK(2, 0, 7),
+	MK(2, 1, 8),
+	MK(3, 0, 10),
+	MK(3, 1, 10),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_power_station_1[] = {
-	MK(0,1, 7),
-	MK(0,2, 7),
-	MK(1,0, 8),
-	MK(1,1, 8),
-	MK(1,2, 7),
-	MK(2,0, 9),
-	MK(2,1, 10),
-	MK(2,2, 9),
+	MK(0, 1, 7),
+	MK(0, 2, 7),
+	MK(1, 0, 8),
+	MK(1, 1, 8),
+	MK(1, 2, 7),
+	MK(2, 0, 9),
+	MK(2, 1, 10),
+	MK(2, 2, 9),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_power_station_2[] = {
-	MK(0,0, 7),
-	MK(0,1, 7),
-	MK(1,0, 9),
-	MK(1,1, 8),
-	MK(2,0, 10),
-	MK(2,1, 9),
+	MK(0, 0, 7),
+	MK(0, 1, 7),
+	MK(1, 0, 9),
+	MK(1, 1, 8),
+	MK(2, 0, 10),
+	MK(2, 1, 9),
 	MKEND
 };
 
@@ -104,26 +104,26 @@ static const IndustryTileTable * const _tile_table_power_station[] = {
 };
 
 static const IndustryTileTable _tile_table_sawmill_0[] = {
-	MK(1,0, 14),
-	MK(1,1, 12),
-	MK(1,2, 11),
-	MK(2,0, 14),
-	MK(2,1, 13),
-	MK(0,0, 15),
-	MK(0,1, 15),
-	MK(0,2, 12),
+	MK(1, 0, 14),
+	MK(1, 1, 12),
+	MK(1, 2, 11),
+	MK(2, 0, 14),
+	MK(2, 1, 13),
+	MK(0, 0, 15),
+	MK(0, 1, 15),
+	MK(0, 2, 12),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_sawmill_1[] = {
-	MK(0,0, 15),
-	MK(0,1, 11),
-	MK(0,2, 14),
-	MK(1,0, 15),
-	MK(1,1, 13),
-	MK(1,2, 12),
-	MK(2,0, 11),
-	MK(2,1, 13),
+	MK(0, 0, 15),
+	MK(0, 1, 11),
+	MK(0, 2, 14),
+	MK(1, 0, 15),
+	MK(1, 1, 13),
+	MK(1, 2, 12),
+	MK(2, 0, 11),
+	MK(2, 1, 13),
 	MKEND
 };
 
@@ -133,51 +133,51 @@ static const IndustryTileTable * const _tile_table_sawmill[] = {
 };
 
 static const IndustryTileTable _tile_table_forest_0[] = {
-	MK(0,0, 16),
-	MK(0,1, 16),
-	MK(0,2, 16),
-	MK(0,3, 16),
-	MK(1,0, 16),
-	MK(1,1, 16),
-	MK(1,2, 16),
-	MK(1,3, 16),
-	MK(2,0, 16),
-	MK(2,1, 16),
-	MK(2,2, 16),
-	MK(2,3, 16),
-	MK(3,0, 16),
-	MK(3,1, 16),
-	MK(3,2, 16),
-	MK(3,3, 16),
-	MK(1,4, 16),
-	MK(2,4, 16),
+	MK(0, 0, 16),
+	MK(0, 1, 16),
+	MK(0, 2, 16),
+	MK(0, 3, 16),
+	MK(1, 0, 16),
+	MK(1, 1, 16),
+	MK(1, 2, 16),
+	MK(1, 3, 16),
+	MK(2, 0, 16),
+	MK(2, 1, 16),
+	MK(2, 2, 16),
+	MK(2, 3, 16),
+	MK(3, 0, 16),
+	MK(3, 1, 16),
+	MK(3, 2, 16),
+	MK(3, 3, 16),
+	MK(1, 4, 16),
+	MK(2, 4, 16),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_forest_1[] = {
-	MK(0,0, 16),
-	MK(1,0, 16),
-	MK(2,0, 16),
-	MK(3,0, 16),
-	MK(4,0, 16),
-	MK(0,1, 16),
-	MK(1,1, 16),
-	MK(2,1, 16),
-	MK(3,1, 16),
-	MK(4,1, 16),
-	MK(0,2, 16),
-	MK(1,2, 16),
-	MK(2,2, 16),
-	MK(3,2, 16),
-	MK(4,2, 16),
-	MK(0,3, 16),
-	MK(1,3, 16),
-	MK(2,3, 16),
-	MK(3,3, 16),
-	MK(4,3, 16),
-	MK(1,4, 16),
-	MK(2,4, 16),
-	MK(3,4, 16),
+	MK(0, 0, 16),
+	MK(1, 0, 16),
+	MK(2, 0, 16),
+	MK(3, 0, 16),
+	MK(4, 0, 16),
+	MK(0, 1, 16),
+	MK(1, 1, 16),
+	MK(2, 1, 16),
+	MK(3, 1, 16),
+	MK(4, 1, 16),
+	MK(0, 2, 16),
+	MK(1, 2, 16),
+	MK(2, 2, 16),
+	MK(3, 2, 16),
+	MK(4, 2, 16),
+	MK(0, 3, 16),
+	MK(1, 3, 16),
+	MK(2, 3, 16),
+	MK(3, 3, 16),
+	MK(4, 3, 16),
+	MK(1, 4, 16),
+	MK(2, 4, 16),
+	MK(3, 4, 16),
 	MKEND
 };
 
@@ -187,40 +187,40 @@ static const IndustryTileTable * const _tile_table_forest[] = {
 };
 
 static const IndustryTileTable _tile_table_oil_refinery_0[] = {
-	MK(0,0, 20),
-	MK(0,1, 21),
-	MK(0,2, 22),
-	MK(0,3, 21),
-	MK(1,0, 20),
-	MK(1,1, 19),
-	MK(1,2, 22),
-	MK(1,3, 20),
-	MK(2,1, 18),
-	MK(2,2, 18),
-	MK(2,3, 18),
-	MK(3,2, 18),
-	MK(3,3, 18),
-	MK(2,0, 23),
-	MK(3,1, 23),
+	MK(0, 0, 20),
+	MK(0, 1, 21),
+	MK(0, 2, 22),
+	MK(0, 3, 21),
+	MK(1, 0, 20),
+	MK(1, 1, 19),
+	MK(1, 2, 22),
+	MK(1, 3, 20),
+	MK(2, 1, 18),
+	MK(2, 2, 18),
+	MK(2, 3, 18),
+	MK(3, 2, 18),
+	MK(3, 3, 18),
+	MK(2, 0, 23),
+	MK(3, 1, 23),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_oil_refinery_1[] = {
-	MK(0,0, 18),
-	MK(0,1, 18),
-	MK(0,2, 21),
-	MK(0,3, 22),
-	MK(0,4, 20),
-	MK(1,0, 18),
-	MK(1,1, 18),
-	MK(1,2, 19),
-	MK(1,3, 20),
-	MK(2,0, 18),
-	MK(2,1, 18),
-	MK(2,2, 19),
-	MK(2,3, 22),
-	MK(1,4, 23),
-	MK(2,4, 23),
+	MK(0, 0, 18),
+	MK(0, 1, 18),
+	MK(0, 2, 21),
+	MK(0, 3, 22),
+	MK(0, 4, 20),
+	MK(1, 0, 18),
+	MK(1, 1, 18),
+	MK(1, 2, 19),
+	MK(1, 3, 20),
+	MK(2, 0, 18),
+	MK(2, 1, 18),
+	MK(2, 2, 19),
+	MK(2, 3, 22),
+	MK(1, 4, 23),
+	MK(2, 4, 23),
 	MKEND
 };
 
@@ -230,51 +230,51 @@ static const IndustryTileTable * const _tile_table_oil_refinery[] = {
 };
 
 static const IndustryTileTable _tile_table_oil_rig_0[] = {
-	MK(0,0, 24),
-	MK(0,1, 24),
-	MK(0,2, 25),
-	MK(1,0, 26),
-	MK(1,1, 27),
-	MK(1,2, 28),
-	MK(-4,-5, 255),
-	MK(-4,-4, 255),
-	MK(-4,-3, 255),
-	MK(-4,-2, 255),
-	MK(-4,-1, 255),
-	MK(-4,0, 255),
-	MK(-4,1, 255),
-	MK(-4,2, 255),
-	MK(-4,3, 255),
-	MK(-4,4, 255),
-	MK(-4,5, 255),
-	MK(-3,5, 255),
-	MK(-2,5, 255),
-	MK(-1,5, 255),
-	MK(0,6, 255),
-	MK(1,6, 255),
-	MK(2,6, 255),
-	MK(3,6, 255),
-	MK(4,6, 255),
-	MK(5,6, 255),
-	MK(5,5, 255),
-	MK(5,4, 255),
-	MK(5,3, 255),
-	MK(5,2, 255),
-	MK(5,1, 255),
-	MK(5,0, 255),
-	MK(5,-1, 255),
-	MK(5,-2, 255),
-	MK(5,-3, 255),
-	MK(5,-4, 255),
-	MK(4,-4, 255),
-	MK(3,-4, 255),
-	MK(2,-4, 255),
-	MK(1,-4, 255),
-	MK(0,-4, 255),
-	MK(-1,-5, 255),
-	MK(-2,-5, 255),
-	MK(-3,-5, 255),
-	MK(2,0, 255),
+	MK(0, 0, 24),
+	MK(0, 1, 24),
+	MK(0, 2, 25),
+	MK(1, 0, 26),
+	MK(1, 1, 27),
+	MK(1, 2, 28),
+	MK(-4, -5, 255),
+	MK(-4, -4, 255),
+	MK(-4, -3, 255),
+	MK(-4, -2, 255),
+	MK(-4, -1, 255),
+	MK(-4, 0, 255),
+	MK(-4, 1, 255),
+	MK(-4, 2, 255),
+	MK(-4, 3, 255),
+	MK(-4, 4, 255),
+	MK(-4, 5, 255),
+	MK(-3, 5, 255),
+	MK(-2, 5, 255),
+	MK(-1, 5, 255),
+	MK(0, 6, 255),
+	MK(1, 6, 255),
+	MK(2, 6, 255),
+	MK(3, 6, 255),
+	MK(4, 6, 255),
+	MK(5, 6, 255),
+	MK(5, 5, 255),
+	MK(5, 4, 255),
+	MK(5, 3, 255),
+	MK(5, 2, 255),
+	MK(5, 1, 255),
+	MK(5, 0, 255),
+	MK(5, -1, 255),
+	MK(5, -2, 255),
+	MK(5, -3, 255),
+	MK(5, -4, 255),
+	MK(4, -4, 255),
+	MK(3, -4, 255),
+	MK(2, -4, 255),
+	MK(1, -4, 255),
+	MK(0, -4, 255),
+	MK(-1, -5, 255),
+	MK(-2, -5, 255),
+	MK(-3, -5, 255),
+	MK(2, 0, 255),
 	MKEND
 };
 
@@ -283,34 +283,34 @@ static const IndustryTileTable * const _tile_table_oil_rig[] = {
 };
 
 static const IndustryTileTable _tile_table_factory_0[] = {
-	MK(0,0, 39),
-	MK(0,1, 40),
-	MK(1,0, 41),
-	MK(1,1, 42),
-	MK(0,2, 39),
-	MK(0,3, 40),
-	MK(1,2, 41),
-	MK(1,3, 42),
-	MK(2,1, 39),
-	MK(2,2, 40),
-	MK(3,1, 41),
-	MK(3,2, 42),
+	MK(0, 0, 39),
+	MK(0, 1, 40),
+	MK(1, 0, 41),
+	MK(1, 1, 42),
+	MK(0, 2, 39),
+	MK(0, 3, 40),
+	MK(1, 2, 41),
+	MK(1, 3, 42),
+	MK(2, 1, 39),
+	MK(2, 2, 40),
+	MK(3, 1, 41),
+	MK(3, 2, 42),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_factory_1[] = {
-	MK(0,0, 39),
-	MK(0,1, 40),
-	MK(1,0, 41),
-	MK(1,1, 42),
-	MK(2,0, 39),
-	MK(2,1, 40),
-	MK(3,0, 41),
-	MK(3,1, 42),
-	MK(1,2, 39),
-	MK(1,3, 40),
-	MK(2,2, 41),
-	MK(2,3, 42),
+	MK(0, 0, 39),
+	MK(0, 1, 40),
+	MK(1, 0, 41),
+	MK(1, 1, 42),
+	MK(2, 0, 39),
+	MK(2, 1, 40),
+	MK(3, 0, 41),
+	MK(3, 1, 42),
+	MK(1, 2, 39),
+	MK(1, 3, 40),
+	MK(2, 2, 41),
+	MK(2, 3, 42),
 	MKEND
 };
 
@@ -320,34 +320,34 @@ static const IndustryTileTable * const _tile_table_factory[] = {
 };
 
 static const IndustryTileTable _tile_table_printing_works_0[] = {
-	MK(0,0, 43),
-	MK(0,1, 44),
-	MK(1,0, 45),
-	MK(1,1, 46),
-	MK(0,2, 43),
-	MK(0,3, 44),
-	MK(1,2, 45),
-	MK(1,3, 46),
-	MK(2,1, 43),
-	MK(2,2, 44),
-	MK(3,1, 45),
-	MK(3,2, 46),
+	MK(0, 0, 43),
+	MK(0, 1, 44),
+	MK(1, 0, 45),
+	MK(1, 1, 46),
+	MK(0, 2, 43),
+	MK(0, 3, 44),
+	MK(1, 2, 45),
+	MK(1, 3, 46),
+	MK(2, 1, 43),
+	MK(2, 2, 44),
+	MK(3, 1, 45),
+	MK(3, 2, 46),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_printing_works_1[] = {
-	MK(0,0, 43),
-	MK(0,1, 44),
-	MK(1,0, 45),
-	MK(1,1, 46),
-	MK(2,0, 43),
-	MK(2,1, 44),
-	MK(3,0, 45),
-	MK(3,1, 46),
-	MK(1,2, 43),
-	MK(1,3, 44),
-	MK(2,2, 45),
-	MK(2,3, 46),
+	MK(0, 0, 43),
+	MK(0, 1, 44),
+	MK(1, 0, 45),
+	MK(1, 1, 46),
+	MK(2, 0, 43),
+	MK(2, 1, 44),
+	MK(3, 0, 45),
+	MK(3, 1, 46),
+	MK(1, 2, 43),
+	MK(1, 3, 44),
+	MK(2, 2, 45),
+	MK(2, 3, 46),
 	MKEND
 };
 
@@ -357,36 +357,36 @@ static const IndustryTileTable * const _tile_table_printing_works[] = {
 };
 
 static const IndustryTileTable _tile_table_steel_mill_0[] = {
-	MK(2,1, 52),
-	MK(2,2, 53),
-	MK(3,1, 54),
-	MK(3,2, 55),
-	MK(0,0, 56),
-	MK(1,0, 57),
-	MK(0,1, 56),
-	MK(1,1, 57),
-	MK(0,2, 56),
-	MK(1,2, 57),
-	MK(2,0, 56),
-	MK(3,0, 57),
+	MK(2, 1, 52),
+	MK(2, 2, 53),
+	MK(3, 1, 54),
+	MK(3, 2, 55),
+	MK(0, 0, 56),
+	MK(1, 0, 57),
+	MK(0, 1, 56),
+	MK(1, 1, 57),
+	MK(0, 2, 56),
+	MK(1, 2, 57),
+	MK(2, 0, 56),
+	MK(3, 0, 57),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_steel_mill_1[] = {
-	MK(0,0, 52),
-	MK(0,1, 53),
-	MK(1,0, 54),
-	MK(1,1, 55),
-	MK(2,0, 52),
-	MK(2,1, 53),
-	MK(3,0, 54),
-	MK(3,1, 55),
-	MK(0,2, 56),
-	MK(1,2, 57),
-	MK(2,2, 56),
-	MK(3,2, 57),
-	MK(1,3, 56),
-	MK(2,3, 57),
+	MK(0, 0, 52),
+	MK(0, 1, 53),
+	MK(1, 0, 54),
+	MK(1, 1, 55),
+	MK(2, 0, 52),
+	MK(2, 1, 53),
+	MK(3, 0, 54),
+	MK(3, 1, 55),
+	MK(0, 2, 56),
+	MK(1, 2, 57),
+	MK(2, 2, 56),
+	MK(3, 2, 57),
+	MK(1, 3, 56),
+	MK(2, 3, 57),
 	MKEND
 };
 
@@ -396,47 +396,47 @@ static const IndustryTileTable * const _tile_table_steel_mill[] = {
 };
 
 static const IndustryTileTable _tile_table_farm_0[] = {
-	MK(1,0, 33),
-	MK(1,1, 34),
-	MK(1,2, 36),
-	MK(0,0, 37),
-	MK(0,1, 37),
-	MK(0,2, 36),
-	MK(2,0, 35),
-	MK(2,1, 38),
-	MK(2,2, 38),
+	MK(1, 0, 33),
+	MK(1, 1, 34),
+	MK(1, 2, 36),
+	MK(0, 0, 37),
+	MK(0, 1, 37),
+	MK(0, 2, 36),
+	MK(2, 0, 35),
+	MK(2, 1, 38),
+	MK(2, 2, 38),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_farm_1[] = {
-	MK(1,1, 33),
-	MK(1,2, 34),
-	MK(0,0, 35),
-	MK(0,1, 36),
-	MK(0,2, 36),
-	MK(0,3, 35),
-	MK(1,0, 37),
-	MK(1,3, 38),
-	MK(2,0, 37),
-	MK(2,1, 37),
-	MK(2,2, 38),
-	MK(2,3, 38),
+	MK(1, 1, 33),
+	MK(1, 2, 34),
+	MK(0, 0, 35),
+	MK(0, 1, 36),
+	MK(0, 2, 36),
+	MK(0, 3, 35),
+	MK(1, 0, 37),
+	MK(1, 3, 38),
+	MK(2, 0, 37),
+	MK(2, 1, 37),
+	MK(2, 2, 38),
+	MK(2, 3, 38),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_farm_2[] = {
-	MK(2,0, 33),
-	MK(2,1, 34),
-	MK(0,0, 36),
-	MK(0,1, 36),
-	MK(0,2, 37),
-	MK(0,3, 37),
-	MK(1,0, 35),
-	MK(1,1, 38),
-	MK(1,2, 38),
-	MK(1,3, 37),
-	MK(2,2, 37),
-	MK(2,3, 35),
+	MK(2, 0, 33),
+	MK(2, 1, 34),
+	MK(0, 0, 36),
+	MK(0, 1, 36),
+	MK(0, 2, 37),
+	MK(0, 3, 37),
+	MK(1, 0, 35),
+	MK(1, 1, 38),
+	MK(1, 2, 38),
+	MK(1, 3, 37),
+	MK(2, 2, 37),
+	MK(2, 3, 35),
 	MKEND
 };
 
@@ -447,27 +447,27 @@ static const IndustryTileTable * const _tile_table_farm[] = {
 };
 
 static const IndustryTileTable _tile_table_copper_mine_0[] = {
-	MK(0,0, 47),
-	MK(0,1, 49),
-	MK(0,2, 51),
-	MK(1,0, 47),
-	MK(1,1, 49),
-	MK(1,2, 50),
-	MK(2,0, 51),
-	MK(2,1, 51),
+	MK(0, 0, 47),
+	MK(0, 1, 49),
+	MK(0, 2, 51),
+	MK(1, 0, 47),
+	MK(1, 1, 49),
+	MK(1, 2, 50),
+	MK(2, 0, 51),
+	MK(2, 1, 51),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_copper_mine_1[] = {
-	MK(0,0, 50),
-	MK(0,1, 47),
-	MK(0,2, 49),
-	MK(1,0, 47),
-	MK(1,1, 49),
-	MK(1,2, 51),
-	MK(2,0, 51),
-	MK(2,1, 47),
-	MK(2,2, 49),
+	MK(0, 0, 50),
+	MK(0, 1, 47),
+	MK(0, 2, 49),
+	MK(1, 0, 47),
+	MK(1, 1, 49),
+	MK(1, 2, 51),
+	MK(2, 0, 51),
+	MK(2, 1, 47),
+	MK(2, 2, 49),
 	MKEND
 };
 
@@ -477,20 +477,20 @@ static const IndustryTileTable * const _tile_table_copper_mine[] = {
 };
 
 static const IndustryTileTable _tile_table_oil_well_0[] = {
-	MK(0,0, 29),
-	MK(1,0, 29),
-	MK(2,0, 29),
-	MK(0,1, 29),
-	MK(0,2, 29),
+	MK(0, 0, 29),
+	MK(1, 0, 29),
+	MK(2, 0, 29),
+	MK(0, 1, 29),
+	MK(0, 2, 29),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_oil_well_1[] = {
-	MK(0,0, 29),
-	MK(1,0, 29),
-	MK(1,1, 29),
-	MK(2,2, 29),
-	MK(2,3, 29),
+	MK(0, 0, 29),
+	MK(1, 0, 29),
+	MK(1, 1, 29),
+	MK(2, 2, 29),
+	MK(2, 3, 29),
 	MKEND
 };
 
@@ -500,8 +500,8 @@ static const IndustryTileTable * const _tile_table_oil_well[] = {
 };
 
 static const IndustryTileTable _tile_table_bank_0[] = {
-	MK(0,0, 58),
-	MK(1,0, 59),
+	MK(0, 0, 58),
+	MK(1, 0, 59),
 	MKEND
 };
 
@@ -510,36 +510,36 @@ static const IndustryTileTable * const _tile_table_bank[] = {
 };
 
 static const IndustryTileTable _tile_table_food_process_0[] = {
-	MK(0,0, 60),
-	MK(1,0, 60),
-	MK(2,0, 60),
-	MK(0,1, 60),
-	MK(1,1, 60),
-	MK(2,1, 60),
-	MK(0,2, 61),
-	MK(1,2, 61),
-	MK(2,2, 63),
-	MK(0,3, 62),
-	MK(1,3, 62),
-	MK(2,3, 63),
+	MK(0, 0, 60),
+	MK(1, 0, 60),
+	MK(2, 0, 60),
+	MK(0, 1, 60),
+	MK(1, 1, 60),
+	MK(2, 1, 60),
+	MK(0, 2, 61),
+	MK(1, 2, 61),
+	MK(2, 2, 63),
+	MK(0, 3, 62),
+	MK(1, 3, 62),
+	MK(2, 3, 63),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_food_process_1[] = {
-	MK(0,0, 61),
-	MK(1,0, 60),
-	MK(2,0, 61),
-	MK(3,0, 61),
-	MK(0,1, 62),
-	MK(1,1, 63),
-	MK(2,1, 63),
-	MK(3,1, 63),
-	MK(0,2, 60),
-	MK(1,2, 60),
-	MK(2,2, 60),
-	MK(3,2, 60),
-	MK(0,3, 62),
-	MK(1,3, 62),
+	MK(0, 0, 61),
+	MK(1, 0, 60),
+	MK(2, 0, 61),
+	MK(3, 0, 61),
+	MK(0, 1, 62),
+	MK(1, 1, 63),
+	MK(2, 1, 63),
+	MK(3, 1, 63),
+	MK(0, 2, 60),
+	MK(1, 2, 60),
+	MK(2, 2, 60),
+	MK(3, 2, 60),
+	MK(0, 3, 62),
+	MK(1, 3, 62),
 	MKEND
 };
 
@@ -549,18 +549,18 @@ static const IndustryTileTable * const _tile_table_food_process[] = {
 };
 
 static const IndustryTileTable _tile_table_paper_mill_0[] = {
-	MK(0,0, 64),
-	MK(1,0, 65),
-	MK(2,0, 66),
-	MK(3,0, 67),
-	MK(0,1, 68),
-	MK(1,1, 69),
-	MK(2,1, 67),
-	MK(3,1, 67),
-	MK(0,2, 66),
-	MK(1,2, 71),
-	MK(2,2, 71),
-	MK(3,2, 70),
+	MK(0, 0, 64),
+	MK(1, 0, 65),
+	MK(2, 0, 66),
+	MK(3, 0, 67),
+	MK(0, 1, 68),
+	MK(1, 1, 69),
+	MK(2, 1, 67),
+	MK(3, 1, 67),
+	MK(0, 2, 66),
+	MK(1, 2, 71),
+	MK(2, 2, 71),
+	MK(3, 2, 70),
 	MKEND
 };
 
@@ -569,22 +569,22 @@ static const IndustryTileTable * const _tile_table_paper_mill[] = {
 };
 
 static const IndustryTileTable _tile_table_gold_mine_0[] = {
-	MK(0,0, 72),
-	MK(0,1, 73),
-	MK(0,2, 74),
-	MK(0,3, 75),
-	MK(1,0, 76),
-	MK(1,1, 77),
-	MK(1,2, 78),
-	MK(1,3, 79),
-	MK(2,0, 80),
-	MK(2,1, 81),
-	MK(2,2, 82),
-	MK(2,3, 83),
-	MK(3,0, 84),
-	MK(3,1, 85),
-	MK(3,2, 86),
-	MK(3,3, 87),
+	MK(0, 0, 72),
+	MK(0, 1, 73),
+	MK(0, 2, 74),
+	MK(0, 3, 75),
+	MK(1, 0, 76),
+	MK(1, 1, 77),
+	MK(1, 2, 78),
+	MK(1, 3, 79),
+	MK(2, 0, 80),
+	MK(2, 1, 81),
+	MK(2, 2, 82),
+	MK(2, 3, 83),
+	MK(3, 0, 84),
+	MK(3, 1, 85),
+	MK(3, 2, 86),
+	MK(3, 3, 87),
 	MKEND
 };
 
@@ -593,8 +593,8 @@ static const IndustryTileTable * const _tile_table_gold_mine[] = {
 };
 
 static const IndustryTileTable _tile_table_bank2_0[] = {
-	MK(0,0, 89),
-	MK(1,0, 90),
+	MK(0, 0, 89),
+	MK(1, 0, 90),
 	MKEND
 };
 
@@ -603,15 +603,15 @@ static const IndustryTileTable * const _tile_table_bank2[] = {
 };
 
 static const IndustryTileTable _tile_table_diamond_mine_0[] = {
-	MK(0,0, 91),
-	MK(0,1, 92),
-	MK(0,2, 93),
-	MK(1,0, 94),
-	MK(1,1, 95),
-	MK(1,2, 96),
-	MK(2,0, 97),
-	MK(2,1, 98),
-	MK(2,2, 99),
+	MK(0, 0, 91),
+	MK(0, 1, 92),
+	MK(0, 2, 93),
+	MK(1, 0, 94),
+	MK(1, 1, 95),
+	MK(1, 2, 96),
+	MK(2, 0, 97),
+	MK(2, 1, 98),
+	MK(2, 2, 99),
 	MKEND
 };
 
@@ -620,22 +620,22 @@ static const IndustryTileTable * const _tile_table_diamond_mine[] = {
 };
 
 static const IndustryTileTable _tile_table_iron_mine_0[] = {
-	MK(0,0, 100),
-	MK(0,1, 101),
-	MK(0,2, 102),
-	MK(0,3, 103),
-	MK(1,0, 104),
-	MK(1,1, 105),
-	MK(1,2, 106),
-	MK(1,3, 107),
-	MK(2,0, 108),
-	MK(2,1, 109),
-	MK(2,2, 110),
-	MK(2,3, 111),
-	MK(3,0, 112),
-	MK(3,1, 113),
-	MK(3,2, 114),
-	MK(3,3, 115),
+	MK(0, 0, 100),
+	MK(0, 1, 101),
+	MK(0, 2, 102),
+	MK(0, 3, 103),
+	MK(1, 0, 104),
+	MK(1, 1, 105),
+	MK(1, 2, 106),
+	MK(1, 3, 107),
+	MK(2, 0, 108),
+	MK(2, 1, 109),
+	MK(2, 2, 110),
+	MK(2, 3, 111),
+	MK(3, 0, 112),
+	MK(3, 1, 113),
+	MK(3, 2, 114),
+	MK(3, 3, 115),
 	MKEND
 };
 
@@ -644,26 +644,26 @@ static const IndustryTileTable * const _tile_table_iron_mine[] = {
 };
 
 static const IndustryTileTable _tile_table_fruit_plantation_0[] = {
-	MK(0,0, 116),
-	MK(0,1, 116),
-	MK(0,2, 116),
-	MK(0,3, 116),
-	MK(1,0, 116),
-	MK(1,1, 116),
-	MK(1,2, 116),
-	MK(1,3, 116),
-	MK(2,0, 116),
-	MK(2,1, 116),
-	MK(2,2, 116),
-	MK(2,3, 116),
-	MK(3,0, 116),
-	MK(3,1, 116),
-	MK(3,2, 116),
-	MK(3,3, 116),
-	MK(4,0, 116),
-	MK(4,1, 116),
-	MK(4,2, 116),
-	MK(4,3, 116),
+	MK(0, 0, 116),
+	MK(0, 1, 116),
+	MK(0, 2, 116),
+	MK(0, 3, 116),
+	MK(1, 0, 116),
+	MK(1, 1, 116),
+	MK(1, 2, 116),
+	MK(1, 3, 116),
+	MK(2, 0, 116),
+	MK(2, 1, 116),
+	MK(2, 2, 116),
+	MK(2, 3, 116),
+	MK(3, 0, 116),
+	MK(3, 1, 116),
+	MK(3, 2, 116),
+	MK(3, 3, 116),
+	MK(4, 0, 116),
+	MK(4, 1, 116),
+	MK(4, 2, 116),
+	MK(4, 3, 116),
 	MKEND
 };
 
@@ -672,26 +672,26 @@ static const IndustryTileTable * const _tile_table_fruit_plantation[] = {
 };
 
 static const IndustryTileTable _tile_table_rubber_plantation_0[] = {
-	MK(0,0, 117),
-	MK(0,1, 117),
-	MK(0,2, 117),
-	MK(0,3, 117),
-	MK(1,0, 117),
-	MK(1,1, 117),
-	MK(1,2, 117),
-	MK(1,3, 117),
-	MK(2,0, 117),
-	MK(2,1, 117),
-	MK(2,2, 117),
-	MK(2,3, 117),
-	MK(3,0, 117),
-	MK(3,1, 117),
-	MK(3,2, 117),
-	MK(3,3, 117),
-	MK(4,0, 117),
-	MK(4,1, 117),
-	MK(4,2, 117),
-	MK(4,3, 117),
+	MK(0, 0, 117),
+	MK(0, 1, 117),
+	MK(0, 2, 117),
+	MK(0, 3, 117),
+	MK(1, 0, 117),
+	MK(1, 1, 117),
+	MK(1, 2, 117),
+	MK(1, 3, 117),
+	MK(2, 0, 117),
+	MK(2, 1, 117),
+	MK(2, 2, 117),
+	MK(2, 3, 117),
+	MK(3, 0, 117),
+	MK(3, 1, 117),
+	MK(3, 2, 117),
+	MK(3, 3, 117),
+	MK(4, 0, 117),
+	MK(4, 1, 117),
+	MK(4, 2, 117),
+	MK(4, 3, 117),
 	MKEND
 };
 
@@ -700,10 +700,10 @@ static const IndustryTileTable * const _tile_table_rubber_plantation[] = {
 };
 
 static const IndustryTileTable _tile_table_water_supply_0[] = {
-	MK(0,0, 118),
-	MK(0,1, 119),
-	MK(1,0, 118),
-	MK(1,1, 119),
+	MK(0, 0, 118),
+	MK(0, 1, 119),
+	MK(1, 0, 118),
+	MK(1, 1, 119),
 	MKEND
 };
 
@@ -712,7 +712,7 @@ static const IndustryTileTable * const _tile_table_water_supply[] = {
 };
 
 static const IndustryTileTable _tile_table_water_tower_0[] = {
-	MK(0,0, 120),
+	MK(0, 0, 120),
 	MKEND
 };
 
@@ -721,26 +721,26 @@ static const IndustryTileTable * const _tile_table_water_tower[] = {
 };
 
 static const IndustryTileTable _tile_table_factory2_0[] = {
-	MK(0,0, 121),
-	MK(0,1, 122),
-	MK(1,0, 123),
-	MK(1,1, 124),
-	MK(0,2, 121),
-	MK(0,3, 122),
-	MK(1,2, 123),
-	MK(1,3, 124),
+	MK(0, 0, 121),
+	MK(0, 1, 122),
+	MK(1, 0, 123),
+	MK(1, 1, 124),
+	MK(0, 2, 121),
+	MK(0, 3, 122),
+	MK(1, 2, 123),
+	MK(1, 3, 124),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_factory2_1[] = {
-	MK(0,0, 121),
-	MK(0,1, 122),
-	MK(1,0, 123),
-	MK(1,1, 124),
-	MK(2,0, 121),
-	MK(2,1, 122),
-	MK(3,0, 123),
-	MK(3,1, 124),
+	MK(0, 0, 121),
+	MK(0, 1, 122),
+	MK(1, 0, 123),
+	MK(1, 1, 124),
+	MK(2, 0, 121),
+	MK(2, 1, 122),
+	MK(3, 0, 123),
+	MK(3, 1, 124),
 	MKEND
 };
 
@@ -750,47 +750,47 @@ static const IndustryTileTable * const _tile_table_factory2[] = {
 };
 
 static const IndustryTileTable _tile_table_farm2_0[] = {
-	MK(1,0, 33),
-	MK(1,1, 34),
-	MK(1,2, 36),
-	MK(0,0, 37),
-	MK(0,1, 37),
-	MK(0,2, 36),
-	MK(2,0, 35),
-	MK(2,1, 38),
-	MK(2,2, 38),
+	MK(1, 0, 33),
+	MK(1, 1, 34),
+	MK(1, 2, 36),
+	MK(0, 0, 37),
+	MK(0, 1, 37),
+	MK(0, 2, 36),
+	MK(2, 0, 35),
+	MK(2, 1, 38),
+	MK(2, 2, 38),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_farm2_1[] = {
-	MK(1,1, 33),
-	MK(1,2, 34),
-	MK(0,0, 35),
-	MK(0,1, 36),
-	MK(0,2, 36),
-	MK(0,3, 35),
-	MK(1,0, 37),
-	MK(1,3, 38),
-	MK(2,0, 37),
-	MK(2,1, 37),
-	MK(2,2, 38),
-	MK(2,3, 38),
+	MK(1, 1, 33),
+	MK(1, 2, 34),
+	MK(0, 0, 35),
+	MK(0, 1, 36),
+	MK(0, 2, 36),
+	MK(0, 3, 35),
+	MK(1, 0, 37),
+	MK(1, 3, 38),
+	MK(2, 0, 37),
+	MK(2, 1, 37),
+	MK(2, 2, 38),
+	MK(2, 3, 38),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_farm2_2[] = {
-	MK(2,0, 33),
-	MK(2,1, 34),
-	MK(0,0, 36),
-	MK(0,1, 36),
-	MK(0,2, 37),
-	MK(0,3, 37),
-	MK(1,0, 35),
-	MK(1,1, 38),
-	MK(1,2, 38),
-	MK(1,3, 37),
-	MK(2,2, 37),
-	MK(2,3, 35),
+	MK(2, 0, 33),
+	MK(2, 1, 34),
+	MK(0, 0, 36),
+	MK(0, 1, 36),
+	MK(0, 2, 37),
+	MK(0, 3, 37),
+	MK(1, 0, 35),
+	MK(1, 1, 38),
+	MK(1, 2, 38),
+	MK(1, 3, 37),
+	MK(2, 2, 37),
+	MK(2, 3, 35),
 	MKEND
 };
 
@@ -801,10 +801,10 @@ static const IndustryTileTable * const _tile_table_farm2[] = {
 };
 
 static const IndustryTileTable _tile_table_lumber_mill_0[] = {
-	MK(0,0, 125),
-	MK(0,1, 126),
-	MK(1,0, 127),
-	MK(1,1, 128),
+	MK(0, 0, 125),
+	MK(0, 1, 126),
+	MK(1, 0, 127),
+	MK(1, 1, 128),
 	MKEND
 };
 
@@ -813,51 +813,51 @@ static const IndustryTileTable * const _tile_table_lumber_mill[] = {
 };
 
 static const IndustryTileTable _tile_table_cotton_candy_0[] = {
-	MK(0,0, 129),
-	MK(0,1, 129),
-	MK(0,2, 129),
-	MK(0,3, 129),
-	MK(1,0, 129),
-	MK(1,1, 129),
-	MK(1,2, 129),
-	MK(1,3, 129),
-	MK(2,0, 129),
-	MK(2,1, 129),
-	MK(2,2, 129),
-	MK(2,3, 129),
-	MK(3,0, 129),
-	MK(3,1, 129),
-	MK(3,2, 129),
-	MK(3,3, 129),
-	MK(1,4, 129),
-	MK(2,4, 129),
+	MK(0, 0, 129),
+	MK(0, 1, 129),
+	MK(0, 2, 129),
+	MK(0, 3, 129),
+	MK(1, 0, 129),
+	MK(1, 1, 129),
+	MK(1, 2, 129),
+	MK(1, 3, 129),
+	MK(2, 0, 129),
+	MK(2, 1, 129),
+	MK(2, 2, 129),
+	MK(2, 3, 129),
+	MK(3, 0, 129),
+	MK(3, 1, 129),
+	MK(3, 2, 129),
+	MK(3, 3, 129),
+	MK(1, 4, 129),
+	MK(2, 4, 129),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_cotton_candy_1[] = {
-	MK(0,0, 129),
-	MK(1,0, 129),
-	MK(2,0, 129),
-	MK(3,0, 129),
-	MK(4,0, 129),
-	MK(0,1, 129),
-	MK(1,1, 129),
-	MK(2,1, 129),
-	MK(3,1, 129),
-	MK(4,1, 129),
-	MK(0,2, 129),
-	MK(1,2, 129),
-	MK(2,2, 129),
-	MK(3,2, 129),
-	MK(4,2, 129),
-	MK(0,3, 129),
-	MK(1,3, 129),
-	MK(2,3, 129),
-	MK(3,3, 129),
-	MK(4,3, 129),
-	MK(1,4, 129),
-	MK(2,4, 129),
-	MK(3,4, 129),
+	MK(0, 0, 129),
+	MK(1, 0, 129),
+	MK(2, 0, 129),
+	MK(3, 0, 129),
+	MK(4, 0, 129),
+	MK(0, 1, 129),
+	MK(1, 1, 129),
+	MK(2, 1, 129),
+	MK(3, 1, 129),
+	MK(4, 1, 129),
+	MK(0, 2, 129),
+	MK(1, 2, 129),
+	MK(2, 2, 129),
+	MK(3, 2, 129),
+	MK(4, 2, 129),
+	MK(0, 3, 129),
+	MK(1, 3, 129),
+	MK(2, 3, 129),
+	MK(3, 3, 129),
+	MK(4, 3, 129),
+	MK(1, 4, 129),
+	MK(2, 4, 129),
+	MK(3, 4, 129),
 	MKEND
 };
 
@@ -867,34 +867,34 @@ static const IndustryTileTable * const _tile_table_cotton_candy[] = {
 };
 
 static const IndustryTileTable _tile_table_candy_factory_0[] = {
-	MK(0,0, 131),
-	MK(0,1, 132),
-	MK(1,0, 133),
-	MK(1,1, 134),
-	MK(0,2, 131),
-	MK(0,3, 132),
-	MK(1,2, 133),
-	MK(1,3, 134),
-	MK(2,1, 131),
-	MK(2,2, 132),
-	MK(3,1, 133),
-	MK(3,2, 134),
+	MK(0, 0, 131),
+	MK(0, 1, 132),
+	MK(1, 0, 133),
+	MK(1, 1, 134),
+	MK(0, 2, 131),
+	MK(0, 3, 132),
+	MK(1, 2, 133),
+	MK(1, 3, 134),
+	MK(2, 1, 131),
+	MK(2, 2, 132),
+	MK(3, 1, 133),
+	MK(3, 2, 134),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_candy_factory_1[] = {
-	MK(0,0, 131),
-	MK(0,1, 132),
-	MK(1,0, 133),
-	MK(1,1, 134),
-	MK(2,0, 131),
-	MK(2,1, 132),
-	MK(3,0, 133),
-	MK(3,1, 134),
-	MK(1,2, 131),
-	MK(1,3, 132),
-	MK(2,2, 133),
-	MK(2,3, 134),
+	MK(0, 0, 131),
+	MK(0, 1, 132),
+	MK(1, 0, 133),
+	MK(1, 1, 134),
+	MK(2, 0, 131),
+	MK(2, 1, 132),
+	MK(3, 0, 133),
+	MK(3, 1, 134),
+	MK(1, 2, 131),
+	MK(1, 3, 132),
+	MK(2, 2, 133),
+	MK(2, 3, 134),
 	MKEND
 };
 
@@ -904,26 +904,26 @@ static const IndustryTileTable * const _tile_table_candy_factory[] = {
 };
 
 static const IndustryTileTable _tile_table_battery_farm_0[] = {
-	MK(0,0, 135),
-	MK(0,1, 135),
-	MK(0,2, 135),
-	MK(0,3, 135),
-	MK(1,0, 135),
-	MK(1,1, 135),
-	MK(1,2, 135),
-	MK(1,3, 135),
-	MK(2,0, 135),
-	MK(2,1, 135),
-	MK(2,2, 135),
-	MK(2,3, 135),
-	MK(3,0, 135),
-	MK(3,1, 135),
-	MK(3,2, 135),
-	MK(3,3, 135),
-	MK(4,0, 135),
-	MK(4,1, 135),
-	MK(4,2, 135),
-	MK(4,3, 135),
+	MK(0, 0, 135),
+	MK(0, 1, 135),
+	MK(0, 2, 135),
+	MK(0, 3, 135),
+	MK(1, 0, 135),
+	MK(1, 1, 135),
+	MK(1, 2, 135),
+	MK(1, 3, 135),
+	MK(2, 0, 135),
+	MK(2, 1, 135),
+	MK(2, 2, 135),
+	MK(2, 3, 135),
+	MK(3, 0, 135),
+	MK(3, 1, 135),
+	MK(3, 2, 135),
+	MK(3, 3, 135),
+	MK(4, 0, 135),
+	MK(4, 1, 135),
+	MK(4, 2, 135),
+	MK(4, 3, 135),
 	MKEND
 };
 
@@ -932,25 +932,25 @@ static const IndustryTileTable * const _tile_table_battery_farm[] = {
 };
 
 static const IndustryTileTable _tile_table_cola_wells_0[] = {
-	MK(0,0, 137),
-	MK(0,1, 137),
-	MK(0,2, 137),
-	MK(1,0, 137),
-	MK(1,1, 137),
-	MK(1,2, 137),
-	MK(2,1, 137),
-	MK(2,2, 137),
+	MK(0, 0, 137),
+	MK(0, 1, 137),
+	MK(0, 2, 137),
+	MK(1, 0, 137),
+	MK(1, 1, 137),
+	MK(1, 2, 137),
+	MK(2, 1, 137),
+	MK(2, 2, 137),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_cola_wells_1[] = {
-	MK(0,1, 137),
-	MK(0,2, 137),
-	MK(0,3, 137),
-	MK(1,0, 137),
-	MK(1,1, 137),
-	MK(1,2, 137),
-	MK(2,1, 137),
+	MK(0, 1, 137),
+	MK(0, 2, 137),
+	MK(0, 3, 137),
+	MK(1, 0, 137),
+	MK(1, 1, 137),
+	MK(1, 2, 137),
+	MK(2, 1, 137),
 	MKEND
 };
 
@@ -960,10 +960,10 @@ static const IndustryTileTable * const _tile_table_cola_wells[] = {
 };
 
 static const IndustryTileTable _tile_table_toy_shop_0[] = {
-	MK(0,0, 138),
-	MK(0,1, 139),
-	MK(1,0, 140),
-	MK(1,1, 141),
+	MK(0, 0, 138),
+	MK(0, 1, 139),
+	MK(1, 0, 140),
+	MK(1, 1, 141),
 	MKEND
 };
 
@@ -972,14 +972,14 @@ static const IndustryTileTable * const _tile_table_toy_shop[] = {
 };
 
 static const IndustryTileTable _tile_table_toy_factory_0[] = {
-	MK(0,0, 147),
-	MK(0,1, 142),
-	MK(1,0, 147),
-	MK(1,1, 143),
-	MK(2,0, 147),
-	MK(2,1, 144),
-	MK(3,0, 146),
-	MK(3,1, 145),
+	MK(0, 0, 147),
+	MK(0, 1, 142),
+	MK(1, 0, 147),
+	MK(1, 1, 143),
+	MK(2, 0, 147),
+	MK(2, 1, 144),
+	MK(3, 0, 146),
+	MK(3, 1, 145),
 	MKEND
 };
 
@@ -988,16 +988,16 @@ static const IndustryTileTable * const _tile_table_toy_factory[] = {
 };
 
 static const IndustryTileTable _tile_table_plastic_fountain_0[] = {
-	MK(0,0, 148),
-	MK(0,1, 151),
-	MK(0,2, 154),
+	MK(0, 0, 148),
+	MK(0, 1, 151),
+	MK(0, 2, 154),
 	MKEND
 };
 
 static const IndustryTileTable _tile_table_plastic_fountain_1[] = {
-	MK(0,0, 148),
-	MK(1,0, 151),
-	MK(2,0, 154),
+	MK(0, 0, 148),
+	MK(1, 0, 151),
+	MK(2, 0, 154),
 	MKEND
 };
 
@@ -1007,10 +1007,10 @@ static const IndustryTileTable * const _tile_table_plastic_fountain[] = {
 };
 
 static const IndustryTileTable _tile_table_fizzy_drink_0[] = {
-	MK(0,0, 156),
-	MK(0,1, 157),
-	MK(1,0, 158),
-	MK(1,1, 159),
+	MK(0, 0, 156),
+	MK(0, 1, 157),
+	MK(1, 0, 158),
+	MK(1, 1, 159),
 	MKEND
 };
 
@@ -1019,18 +1019,18 @@ static const IndustryTileTable * const _tile_table_fizzy_drink[] = {
 };
 
 static const IndustryTileTable _tile_table_bubble_generator_0[] = {
-	MK(0,0, 163),
-	MK(0,1, 160),
-	MK(1,0, 163),
-	MK(1,1, 161),
-	MK(2,0, 163),
-	MK(2,1, 162),
-	MK(0,2, 163),
-	MK(0,3, 160),
-	MK(1,2, 163),
-	MK(1,3, 161),
-	MK(2,2, 163),
-	MK(2,3, 162),
+	MK(0, 0, 163),
+	MK(0, 1, 160),
+	MK(1, 0, 163),
+	MK(1, 1, 161),
+	MK(2, 0, 163),
+	MK(2, 1, 162),
+	MK(0, 2, 163),
+	MK(0, 3, 160),
+	MK(1, 2, 163),
+	MK(1, 3, 161),
+	MK(2, 2, 163),
+	MK(2, 3, 162),
 	MKEND
 };
 
@@ -1039,9 +1039,9 @@ static const IndustryTileTable * const _tile_table_bubble_generator[] = {
 };
 
 static const IndustryTileTable _tile_table_toffee_quarry_0[] = {
-	MK(0,0, 164),
-	MK(1,0, 165),
-	MK(2,0, 166),
+	MK(0, 0, 164),
+	MK(1, 0, 165),
+	MK(2, 0, 166),
 	MKEND
 };
 
@@ -1050,14 +1050,14 @@ static const IndustryTileTable * const _tile_table_toffee_quarry[] = {
 };
 
 static const IndustryTileTable _tile_table_sugar_mine_0[] = {
-	MK(0,0, 167),
-	MK(0,1, 168),
-	MK(1,0, 169),
-	MK(1,1, 170),
-	MK(2,0, 171),
-	MK(2,1, 172),
-	MK(3,0, 173),
-	MK(3,1, 174),
+	MK(0, 0, 167),
+	MK(0, 1, 168),
+	MK(1, 0, 169),
+	MK(1, 1, 170),
+	MK(2, 0, 171),
+	MK(2, 1, 172),
+	MK(3, 0, 173),
+	MK(3, 1, 174),
 	MKEND
 };
 
@@ -1103,7 +1103,7 @@ static const IndustryTileTable * const _tile_table_sugar_mine[] = {
  * @param s3   text for production down
  */
 
-#define MI(tbl, d, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col,\
+#define MI(tbl, d, ai1, ai2, ai3, ai4, ag1, ag2, ag3, ag4, col, \
            c1, c2, c3, proc, p1, r1, p2, r2, m, a1, a2, a3, pr, clim, bev, in, intx, s1, s2, s3) \
 	{tbl, lengthof(tbl), d, {c1, c2, c3}, proc, {p1, p2}, {r1, r2}, m,            \
 	 {a1, a2, a3}, pr, clim, bev, col, in, intx, s1, s2, s3, {ai1, ai2, ai3, ai4}, {ag1, ag2, ag3, ag4}, 0, 0, 0, 0}