From fd0f57a79485641b632da4525e28ae397c892e54 Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Fri, 15 Feb 2008 18:34:26 +0000
Subject: (svn r12148) -Codechange: Merge 'image' and 'pal' of
 DrawTileSeqStruct into one PalSpriteID

---
 src/table/road_land.h      | 4 ++--
 src/table/station_land.h   | 6 +++---
 src/table/track_land.h     | 4 ++--
 src/table/unmovable_land.h | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/table')

diff --git a/src/table/road_land.h b/src/table/road_land.h
index 4b46cf3eb..32980606a 100644
--- a/src/table/road_land.h
+++ b/src/table/road_land.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 
-#define TILE_SEQ_LINE(img, pal, dx, dy, sx, sy) { dx, dy, 0, sx, sy, 20, img, pal },
-#define TILE_SEQ_END() { 0, 0, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_LINE(img, pal, dx, dy, sx, sy) { dx, dy, 0, sx, sy, 20, {img, pal} },
+#define TILE_SEQ_END() { 0, 0, 0, 0, 0, 0, {0, 0} }
 
 static const DrawTileSeqStruct _road_depot_NE[] = {
 	TILE_SEQ_LINE(0x584 | (1 << PALETTE_MODIFIER_COLOR), PAL_NONE, 0, 15, 16, 1)
diff --git a/src/table/station_land.h b/src/table/station_land.h
index 1e8356e4d..87523d5f5 100644
--- a/src/table/station_land.h
+++ b/src/table/station_land.h
@@ -1,8 +1,8 @@
 /* $Id$ */
 
-#define TILE_SEQ_LINE(dx, dy, dz, sx, sy, sz, img) { dx, dy, dz, sx, sy, sz, img, PAL_NONE },
-#define TILE_SEQ_LINE_PAL(dx, dy, dz, sx, sy, sz, img, pal) { dx, dy, dz, sx, sy, sz, img, pal },
-#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_LINE(dx, dy, dz, sx, sy, sz, img) { dx, dy, dz, sx, sy, sz, {img, PAL_NONE} },
+#define TILE_SEQ_LINE_PAL(dx, dy, dz, sx, sy, sz, img, pal) { dx, dy, dz, sx, sy, sz, {img, pal} },
+#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, {0, 0} }
 
 static const DrawTileSeqStruct _station_display_nothing[] = {
 	TILE_SEQ_END()
diff --git a/src/table/track_land.h b/src/table/track_land.h
index d447778a1..176c35399 100644
--- a/src/table/track_land.h
+++ b/src/table/track_land.h
@@ -1,7 +1,7 @@
 /* $Id$ */
 
-#define TILE_SEQ_LINE(img, dx, dy, sx, sy) { dx, dy, 0, sx, sy, 23, img, PAL_NONE },
-#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_LINE(img, dx, dy, sx, sy) { dx, dy, 0, sx, sy, 23, {img, PAL_NONE} },
+#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, {0, 0} }
 
 
 static const DrawTileSeqStruct _depot_gfx_NE[] = {
diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h
index d793a0979..123698181 100644
--- a/src/table/unmovable_land.h
+++ b/src/table/unmovable_land.h
@@ -15,8 +15,8 @@ static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = {
 	{0xA2A, 4, 4, 7, 7, 61, 0},
 };
 
-#define TILE_SEQ_LINE(sz, img) { 0, 0, 0, 16, 16, sz, img, PAL_NONE },
-#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, 0, 0 }
+#define TILE_SEQ_LINE(sz, img) { 0, 0, 0, 16, 16, sz, {img, PAL_NONE} },
+#define TILE_SEQ_END() { (byte)0x80, 0, 0, 0, 0, 0, {0, 0} }
 
 static const DrawTileSeqStruct _unmovable_display_nothing[] = {
 	TILE_SEQ_END()
-- 
cgit v1.2.3-70-g09d2