cpp/openttd-patchpack/source Changeset - r2571:0cfcd6d312a3

Changeset - r2571:0cfcd6d312a3

Parent rev.

Child rev.

[Not reviewed]

master

0 8 0

tron - 18 years ago 2005-10-31 10:23:58
tron@openttd.org

(svn r3108) Confine the use of SPR_OPENTTD_BASE to table/sprites.h by adding/using some sprite enums

8 files changed with 149 insertions and 117 deletions:

gfxinit.c

main_gui.c

rail_gui.c

railtypes.h

table/bridge_land.h

table/sprites.h

table/station_land.h

table/track_land.h

0 comments (0 inline, 0 general)

gfxinit.c

➞

Show inline comments

@@ @@ -270,22 +270,22 @@ static const SpriteID trg1idx[] = { @@
  * amount of sprites and add them to the end of the list, with the index of
  * the old sprite-count offset from SPR_OPENTTD_BASE. With this there is no
  * correspondence of any kind with the ID's in the grf file, but results in
  * a maximum use of sprite slots. */
 #define OPENTTD_SPRITES_COUNT 101
 static const SpriteID _openttd_grf_indexes[] = {
-	SPR_OPENTTD_BASE + 0, SPR_OPENTTD_BASE + 7, // icons etc
+	SPR_IMG_AUTORAIL, SPR_CURSOR_WAYPOINT, // icons etc
 , 134,  // euro symbol medium size
 , 582,  // euro symbol large size
 , 358,  // euro symbol tiny
-	SPR_OPENTTD_BASE+11, SPR_OPENTTD_BASE+57, // more icons
+	SPR_CURSOR_CANAL, SPR_IMG_FASTFORWARD, // more icons
 , 648, // nordic char: æ
 , 616, // nordic char: Æ
 , 666, // nordic char: ø
 , 634, // nordic char: Ø
-	SPR_OPENTTD_BASE+62, SPR_OPENTTD_BASE + 100, // more icons
+	SPR_PIN_UP, SPR_CURSOR_CLONE, // more icons
 , 383, // ¼ ½ tiny
 , 159, // ¼ ½ medium
 , 607, // ¼ ½ large
 , 360, // ¦ tiny
 , 362, // ¨ tiny
 , 136, // ¦ medium
@@ @@ -305,13 +305,13 @@ static const SpriteID _openttd_grf_index @@
 , 380, // º tiny
 , 156, // º medium
 , 604, // º large
 , 320, // { | } ~ tiny
 ,  96, // { | } ~ medium
 , 544, // { | } ~ large
-	SPR_OPENTTD_BASE + 101, SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // icon (HOUSE)
+	SPR_HOUSE_ICON, SPR_HOUSE_ICON,
 xffff,
 };
 static byte _sprite_page_to_load = 0xFF;
 static void LoadSpriteTables(void)

main_gui.c

➞

Show inline comments

@@ @@ -1959,13 +1959,13 @@ static void MainToolbarWndProc(Window *w @@
 		break;
+	}
+}
 static const Widget _toolb_normal_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,    21,     0,    21, 0x2D6, STR_0171_PAUSE_GAME},
-{      WWT_PANEL,   RESIZE_NONE,    14,    22,    43,     0,    21, SPR_OPENTTD_BASE + 57, STR_FAST_FORWARD},
+{      WWT_PANEL,   RESIZE_NONE,    14,    22,    43,     0,    21, SPR_IMG_FASTFORWARD, STR_FAST_FORWARD},
 {      WWT_PANEL,   RESIZE_NONE,    14,    44,    65,     0,    21, 0x2EF, STR_0187_OPTIONS},
 {    WWT_PANEL_2,   RESIZE_NONE,    14,    66,    87,     0,    21, 0x2D4, STR_0172_SAVE_GAME_ABANDON_GAME},
 {      WWT_PANEL,   RESIZE_NONE,    14,    96,   117,     0,    21, 0x2C4, STR_0174_DISPLAY_MAP},
 {      WWT_PANEL,   RESIZE_NONE,    14,   118,   139,     0,    21, 0xFED, STR_0176_DISPLAY_TOWN_DIRECTORY},
 {      WWT_PANEL,   RESIZE_NONE,    14,   140,   161,     0,    21, 0x2A7, STR_02DC_DISPLAY_SUBSIDIES},
@@ @@ -2013,13 +2013,13 @@ static const WindowDesc _toolb_intro_des @@
 	MainToolbarWndProc
 };
 static const Widget _toolb_scen_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,    21,     0,    21, 0x2D6,				STR_0171_PAUSE_GAME},
-{      WWT_PANEL,   RESIZE_NONE,    14,    22,    43,     0,    21, SPR_OPENTTD_BASE + 57,	STR_FAST_FORWARD},
+{      WWT_PANEL,   RESIZE_NONE,    14,    22,    43,     0,    21, SPR_IMG_FASTFORWARD, STR_FAST_FORWARD},
 {      WWT_PANEL,   RESIZE_NONE,    14,    44,    65,     0,    21, 0x2EF,				STR_0187_OPTIONS},
 {    WWT_PANEL_2,   RESIZE_NONE,    14,    66,    87,     0,    21, 0x2D4,				STR_0297_SAVE_SCENARIO_LOAD_SCENARIO},
 {      WWT_PANEL,   RESIZE_NONE,    14,    96,   225,     0,    21, 0x0,					STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    14,   233,   362,     0,    21, 0x0,					STR_NULL},

rail_gui.c

➞

Show inline comments

@@ @@ -492,24 +492,24 @@ static const Widget _build_rail_widgets[ @@
 {      WWT_PANEL,   RESIZE_NONE,     7,   110,   113,    14,    35, 0x0,			STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,     7,    0,     21,    14,    35, 0x4E3,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,   RESIZE_NONE,     7,    22,    43,    14,    35, 0x4E4,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,   RESIZE_NONE,     7,    44,    65,    14,    35, 0x4E5,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,   RESIZE_NONE,     7,    66,    87,    14,    35, 0x4E6,		STR_1018_BUILD_RAILROAD_TRACK},
-{      WWT_PANEL,   RESIZE_NONE,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 0, STR_BUILD_AUTORAIL_TIP},
+{      WWT_PANEL,   RESIZE_NONE,     7,    88,   109,    14,    35, SPR_IMG_AUTORAIL, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,   RESIZE_NONE,     7,   114,   135,    14,    35, 0x2BF,		STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,   RESIZE_NONE,     7,   136,   157,    14,    35, 0x50E,		STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
-{      WWT_PANEL,   RESIZE_NONE,     7,   158,   179,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
+{      WWT_PANEL,   RESIZE_NONE,     7,   158,   179,    14,    35, SPR_IMG_WAYPOINT, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,   RESIZE_NONE,     7,   180,   221,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,   RESIZE_NONE,     7,   222,   243,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,   RESIZE_NONE,     7,   244,   285,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
-{      WWT_PANEL,   RESIZE_NONE,     7,   286,   305,    14,    35, 0x97E,		STR_101D_BUILD_RAILROAD_TUNNEL},
+{      WWT_PANEL,   RESIZE_NONE,     7,   286,   305,    14,    35, SPR_IMG_TUNNEL_RAIL, STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,   RESIZE_NONE,     7,   306,   327,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
-{      WWT_PANEL,   RESIZE_NONE,     7,   328,   349,    14,    35, SPR_OPENTTD_BASE + 25, STR_CONVERT_RAIL_TIP},
+{      WWT_PANEL,   RESIZE_NONE,     7,   328,   349,    14,    35, SPR_IMG_CONVERT_RAIL, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,   RESIZE_NONE,     7,   350,   371,    14,    35, SPR_IMG_LANDSCAPING,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };

railtypes.h

➞

Show inline comments

@@ @@ -14,13 +14,17 @@ const RailtypeInfo _railtypes[] = { @@
 			SPR_CROSSING_OFF_X_RAIL,
 			SPR_TUNNEL_ENTRY_REAR_RAIL
 		},
 		/* GUI sprites */
 		{ 0x4E3, 0x4E4, 0x4E5, 0x4E6,
 			SPR_OPENTTD_BASE + 0, 0x50E, 0x97E, SPR_OPENTTD_BASE + 25 },
 			SPR_IMG_AUTORAIL,
 			SPR_IMG_DEPOT_RAIL,
 			SPR_IMG_TUNNEL_RAIL,
 			SPR_IMG_CONVERT_RAIL
 		},
+		{
 			SPR_CURSOR_NS_TRACK,
 			SPR_CURSOR_SWNE_TRACK,
 			SPR_CURSOR_EW_TRACK,
 			SPR_CURSOR_NWSE_TRACK,
@@ @@ -53,13 +57,17 @@ const RailtypeInfo _railtypes[] = { @@
 			SPR_CROSSING_OFF_X_MONO,
 			SPR_TUNNEL_ENTRY_REAR_MONO
 		},
 		/* GUI sprites */
 		{ 0x4E7, 0x4E8, 0x4E9, 0x4EA,
 			SPR_OPENTTD_BASE + 1, SPR_OPENTTD_BASE + 12, 0x97F, SPR_OPENTTD_BASE + 27 },
 			SPR_IMG_AUTOMONO,
 			SPR_IMG_DEPOT_MONO,
 			SPR_IMG_TUNNEL_MONO,
 			SPR_IMG_CONVERT_MONO
 		},
+		{
 			SPR_CURSOR_NS_MONO,
 			SPR_CURSOR_SWNE_MONO,
 			SPR_CURSOR_EW_MONO,
 			SPR_CURSOR_NWSE_MONO,
@@ @@ -92,13 +100,17 @@ const RailtypeInfo _railtypes[] = { @@
 			SPR_CROSSING_OFF_X_MAGLEV,
 			SPR_TUNNEL_ENTRY_REAR_MAGLEV
 		},
 		/* GUI sprites */
 		{ 0x4EB, 0x4EC, 0x4EE, 0x4ED,
 			SPR_OPENTTD_BASE + 2, SPR_OPENTTD_BASE + 13, 0x980, SPR_OPENTTD_BASE + 29 },
 			SPR_IMG_AUTOMAGLEV,
 			SPR_IMG_DEPOT_MAGLEV,
 			SPR_IMG_TUNNEL_MAGLEV,
 			SPR_IMG_CONVERT_MAGLEV
 		},
+		{
 			SPR_CURSOR_NS_MAGLEV,
 			SPR_CURSOR_SWNE_MAGLEV,
 			SPR_CURSOR_EW_MAGLEV,
 			SPR_CURSOR_NWSE_MAGLEV,

table/bridge_land.h

➞

Show inline comments

@@ @@ -42,24 +42,24 @@ static const PalSpriteID _bridge_sprite_ @@
 x98E | PALETTE_31D, 0x990 | PALETTE_31D, 0x98D | PALETTE_31D, 0x98F | PALETTE_31D, 0x992 | PALETTE_31D, 0x994 | PALETTE_31D, 0x991 | PALETTE_31D, 0x993 | PALETTE_31D,
 x10E7 | PALETTE_31D, 0x10E9 | PALETTE_31D, 0x10E6 | PALETTE_31D, 0x10E8 | PALETTE_31D, 0x10EB | PALETTE_31D, 0x10ED | PALETTE_31D, 0x10EA | PALETTE_31D, 0x10EC | PALETTE_31D,
 x110F | PALETTE_31D, 0x1111 | PALETTE_31D, 0x110E | PALETTE_31D, 0x1110 | PALETTE_31D, 0x1113 | PALETTE_31D, 0x1115 | PALETTE_31D, 0x1112 | PALETTE_31D, 0x1114 | PALETTE_31D,
 };
 static const PalSpriteID _bridge_sprite_table_2_poles[] = {
 	SPR_OPENTTD_BASE + 36 + 6*3,
 	SPR_OPENTTD_BASE + 36 + 6*3,
 	SPR_OPENTTD_BASE + 36 + 6*3,
 	SPR_OPENTTD_BASE + 36 + 6*3,
 	SPR_OPENTTD_BASE + 38 + 6*3,
 	SPR_PILLARS_BASE + 6 * 3 + 3,
 	SPR_PILLARS_BASE + 6 * 3 + 3,
 	SPR_PILLARS_BASE + 6 * 3 + 3,
 	SPR_PILLARS_BASE + 6 * 3 + 3,
 	SPR_PILLARS_BASE + 6 * 3 + 5,
 x0,
 	SPR_OPENTTD_BASE + 33 + 6*3,
 	SPR_OPENTTD_BASE + 33 + 6*3,
 	SPR_OPENTTD_BASE + 33 + 6*3,
 	SPR_OPENTTD_BASE + 33 + 6*3,
 	SPR_OPENTTD_BASE + 35 + 6*3,
 	SPR_PILLARS_BASE + 6 * 3 + 0,
 	SPR_PILLARS_BASE + 6 * 3 + 0,
 	SPR_PILLARS_BASE + 6 * 3 + 0,
 	SPR_PILLARS_BASE + 6 * 3 + 0,
 	SPR_PILLARS_BASE + 6 * 3 + 2,
 x0,
 x0,
 x0,
 };
@@ @@ -110,99 +110,99 @@ static const PalSpriteID _bridge_sprite_ @@
 x98E,     0x990,     0x98D,     0x98F,     0x992,     0x994,     0x991,     0x993,
 x10E7,    0x10E9,    0x10E6,    0x10E8,    0x10EB,    0x10ED,    0x10EA,    0x10EC,
 x110F,    0x1111,    0x110E,    0x1110,    0x1113,    0x1115,    0x1112,    0x1114,
 };
 static const PalSpriteID _bridge_sprite_table_4_poles[] = {
 	SPR_OPENTTD_BASE + 36,
 	SPR_OPENTTD_BASE + 37,
 	SPR_OPENTTD_BASE + 37,
 	SPR_OPENTTD_BASE + 36,
 	SPR_OPENTTD_BASE + 38,
 	SPR_PILLARS_BASE + 6 * 0 + 3,
 	SPR_PILLARS_BASE + 6 * 0 + 4,
 	SPR_PILLARS_BASE + 6 * 0 + 4,
 	SPR_PILLARS_BASE + 6 * 0 + 3,
 	SPR_PILLARS_BASE + 6 * 0 + 5,
 x0,
 	SPR_OPENTTD_BASE + 33,
 	SPR_OPENTTD_BASE + 34,
 	SPR_OPENTTD_BASE + 34,
 	SPR_OPENTTD_BASE + 33,
 	SPR_OPENTTD_BASE + 35,
 	SPR_PILLARS_BASE + 6 * 0 + 0,
 	SPR_PILLARS_BASE + 6 * 0 + 1,
 	SPR_PILLARS_BASE + 6 * 0 + 1,
 	SPR_PILLARS_BASE + 6 * 0 + 0,
 	SPR_PILLARS_BASE + 6 * 0 + 2,
 x0,
 x0,
 x0,
 };
 static const PalSpriteID _bridge_sprite_table_5_0[] = {
 x9A9 | PALETTE_TO_STRUCT_YELLOW, 0x99F | PALETTE_TO_STRUCT_YELLOW, 0x9B1 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x9A5 | PALETTE_TO_STRUCT_YELLOW, 0x997 | PALETTE_TO_STRUCT_YELLOW, 0x9AD | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x99D | PALETTE_TO_STRUCT_YELLOW, 0x99F | PALETTE_TO_STRUCT_YELLOW, 0x9B1 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x995 | PALETTE_TO_STRUCT_YELLOW, 0x997 | PALETTE_TO_STRUCT_YELLOW, 0x9AD | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x10F2 | PALETTE_TO_STRUCT_YELLOW, 0x99F | PALETTE_TO_STRUCT_YELLOW, 0x9B1 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x10EE | PALETTE_TO_STRUCT_YELLOW, 0x997 | PALETTE_TO_STRUCT_YELLOW, 0x9AD | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x111A | PALETTE_TO_STRUCT_YELLOW, 0x99F | PALETTE_TO_STRUCT_YELLOW, 0x9B1 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x1116 | PALETTE_TO_STRUCT_YELLOW, 0x997 | PALETTE_TO_STRUCT_YELLOW, 0x9AD | PALETTE_TO_STRUCT_YELLOW,       0x0,
-	SPR_OPENTTD_BASE + 35,
+	SPR_PILLARS_BASE + 2
 };
 static const PalSpriteID _bridge_sprite_table_5_1[] = {
 x9AA | PALETTE_TO_STRUCT_YELLOW, 0x9A0 | PALETTE_TO_STRUCT_YELLOW, 0x9B2 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x9A6 | PALETTE_TO_STRUCT_YELLOW, 0x998 | PALETTE_TO_STRUCT_YELLOW, 0x9AE | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x99E | PALETTE_TO_STRUCT_YELLOW, 0x9A0 | PALETTE_TO_STRUCT_YELLOW, 0x9B2 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x996 | PALETTE_TO_STRUCT_YELLOW, 0x998 | PALETTE_TO_STRUCT_YELLOW, 0x9AE | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x10F3 | PALETTE_TO_STRUCT_YELLOW, 0x9A0 | PALETTE_TO_STRUCT_YELLOW, 0x9B2 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x10EF | PALETTE_TO_STRUCT_YELLOW, 0x998 | PALETTE_TO_STRUCT_YELLOW, 0x9AE | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x111B | PALETTE_TO_STRUCT_YELLOW, 0x9A0 | PALETTE_TO_STRUCT_YELLOW, 0x9B2 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x1117 | PALETTE_TO_STRUCT_YELLOW, 0x998 | PALETTE_TO_STRUCT_YELLOW, 0x9AE | PALETTE_TO_STRUCT_YELLOW,       0x0,
-	SPR_OPENTTD_BASE + 36,
+	SPR_PILLARS_BASE + 3
 };
 static const PalSpriteID _bridge_sprite_table_5_2[] = {
 x9AC | PALETTE_TO_STRUCT_YELLOW, 0x9A4 | PALETTE_TO_STRUCT_YELLOW, 0x9B4 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x9A8 | PALETTE_TO_STRUCT_YELLOW, 0x99C | PALETTE_TO_STRUCT_YELLOW, 0x9B0 | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x9A2 | PALETTE_TO_STRUCT_YELLOW, 0x9A4 | PALETTE_TO_STRUCT_YELLOW, 0x9B4 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x99A | PALETTE_TO_STRUCT_YELLOW, 0x99C | PALETTE_TO_STRUCT_YELLOW, 0x9B0 | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x10F5 | PALETTE_TO_STRUCT_YELLOW, 0x9A4 | PALETTE_TO_STRUCT_YELLOW, 0x9B4 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x10F1 | PALETTE_TO_STRUCT_YELLOW, 0x99C | PALETTE_TO_STRUCT_YELLOW, 0x9B0 | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x111D | PALETTE_TO_STRUCT_YELLOW, 0x9A4 | PALETTE_TO_STRUCT_YELLOW, 0x9B4 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x1119 | PALETTE_TO_STRUCT_YELLOW, 0x99C | PALETTE_TO_STRUCT_YELLOW, 0x9B0 | PALETTE_TO_STRUCT_YELLOW,       0x0,
-	SPR_OPENTTD_BASE + 36,
+	SPR_PILLARS_BASE + 3
 };
 static const PalSpriteID _bridge_sprite_table_5_3[] = {
 x9AB | PALETTE_TO_STRUCT_YELLOW, 0x9A3 | PALETTE_TO_STRUCT_YELLOW, 0x9B3 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x9A7 | PALETTE_TO_STRUCT_YELLOW, 0x99B | PALETTE_TO_STRUCT_YELLOW, 0x9AF | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x9A1 | PALETTE_TO_STRUCT_YELLOW, 0x9A3 | PALETTE_TO_STRUCT_YELLOW, 0x9B3 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x999 | PALETTE_TO_STRUCT_YELLOW, 0x99B | PALETTE_TO_STRUCT_YELLOW, 0x9AF | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x10F4 | PALETTE_TO_STRUCT_YELLOW, 0x9A3 | PALETTE_TO_STRUCT_YELLOW, 0x9B3 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x10F0 | PALETTE_TO_STRUCT_YELLOW, 0x99B | PALETTE_TO_STRUCT_YELLOW, 0x9AF | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x111C | PALETTE_TO_STRUCT_YELLOW, 0x9A3 | PALETTE_TO_STRUCT_YELLOW, 0x9B3 | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x1118 | PALETTE_TO_STRUCT_YELLOW, 0x99B | PALETTE_TO_STRUCT_YELLOW, 0x9AF | PALETTE_TO_STRUCT_YELLOW,       0x0,
-	SPR_OPENTTD_BASE + 35,
+	SPR_PILLARS_BASE + 2
 };
 static const PalSpriteID _bridge_sprite_table_5_4[] = {
 x9B6 | PALETTE_TO_STRUCT_YELLOW, 0x9BA | PALETTE_TO_STRUCT_YELLOW, 0x9BC | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x9B5 | PALETTE_TO_STRUCT_YELLOW, 0x9B9 | PALETTE_TO_STRUCT_YELLOW, 0x9BB | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x9B8 | PALETTE_TO_STRUCT_YELLOW, 0x9BA | PALETTE_TO_STRUCT_YELLOW, 0x9BC | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x9B7 | PALETTE_TO_STRUCT_YELLOW, 0x9B9 | PALETTE_TO_STRUCT_YELLOW, 0x9BB | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x10F7 | PALETTE_TO_STRUCT_YELLOW, 0x9BA | PALETTE_TO_STRUCT_YELLOW, 0x9BC | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x10F6 | PALETTE_TO_STRUCT_YELLOW, 0x9B9 | PALETTE_TO_STRUCT_YELLOW, 0x9BB | PALETTE_TO_STRUCT_YELLOW,       0x0,
 x111F | PALETTE_TO_STRUCT_YELLOW, 0x9BA | PALETTE_TO_STRUCT_YELLOW, 0x9BC | PALETTE_TO_STRUCT_YELLOW,       0x0, 0x111E | PALETTE_TO_STRUCT_YELLOW, 0x9B9 | PALETTE_TO_STRUCT_YELLOW, 0x9BB | PALETTE_TO_STRUCT_YELLOW,       0x0,
-	SPR_OPENTTD_BASE+38,  0x0, 0x0,		   0x0, SPR_OPENTTD_BASE + 37,
+	SPR_PILLARS_BASE + 5, 0x0, 0x0, 0x0, SPR_PILLARS_BASE + 4
 };
 static const PalSpriteID _bridge_sprite_table_5_5[] = {
 x9BD | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x9BE | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
 x9BF | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x9C0 | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
 x10F8 | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x10F9 | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
 x1120 | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x1121 | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
-x0, SPR_OPENTTD_BASE + 35,
+x0, SPR_PILLARS_BASE + 2
 };
 static const PalSpriteID _bridge_sprite_table_5_6[] = {
 x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
 x98E | PALETTE_TO_STRUCT_YELLOW, 0x990 | PALETTE_TO_STRUCT_YELLOW, 0x98D | PALETTE_TO_STRUCT_YELLOW, 0x98F | PALETTE_TO_STRUCT_YELLOW, 0x992 | PALETTE_TO_STRUCT_YELLOW, 0x994 | PALETTE_TO_STRUCT_YELLOW, 0x991 | PALETTE_TO_STRUCT_YELLOW, 0x993 | PALETTE_TO_STRUCT_YELLOW,
 x10E7 | PALETTE_TO_STRUCT_YELLOW, 0x10E9 | PALETTE_TO_STRUCT_YELLOW, 0x10E6 | PALETTE_TO_STRUCT_YELLOW, 0x10E8 | PALETTE_TO_STRUCT_YELLOW, 0x10EB | PALETTE_TO_STRUCT_YELLOW, 0x10ED | PALETTE_TO_STRUCT_YELLOW, 0x10EA | PALETTE_TO_STRUCT_YELLOW, 0x10EC | PALETTE_TO_STRUCT_YELLOW,
 x110F | PALETTE_TO_STRUCT_YELLOW, 0x1111 | PALETTE_TO_STRUCT_YELLOW, 0x110E | PALETTE_TO_STRUCT_YELLOW, 0x1110 | PALETTE_TO_STRUCT_YELLOW, 0x1113 | PALETTE_TO_STRUCT_YELLOW, 0x1115 | PALETTE_TO_STRUCT_YELLOW, 0x1112 | PALETTE_TO_STRUCT_YELLOW, 0x1114 | PALETTE_TO_STRUCT_YELLOW,
-x0, SPR_OPENTTD_BASE + 35,
+x0, SPR_PILLARS_BASE + 2,
 };
 static const PalSpriteID _bridge_sprite_table_5_poles[] = {
 	SPR_OPENTTD_BASE + 36 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 37 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 37 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 36 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 38 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 4 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 4 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 5 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 x0,
 	SPR_OPENTTD_BASE + 33 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 34 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 34 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 33 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 35 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 1 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 1 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 0 + 2 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 x0,
 x0,
 x0,
 };
@@ @@ -250,28 +250,28 @@ static const PalSpriteID _bridge_sprite_ @@
 static const PalSpriteID _bridge_sprite_table_3_6[] = {
 x986,     0x988,     0x985,     0x987,     0x98A,     0x98C,     0x989,     0x98B,
 x98E | PALETTE_TO_STRUCT_CONCRETE, 0x990 | PALETTE_TO_STRUCT_CONCRETE, 0x98D | PALETTE_TO_STRUCT_CONCRETE, 0x98F | PALETTE_TO_STRUCT_CONCRETE, 0x992 | PALETTE_TO_STRUCT_CONCRETE, 0x994 | PALETTE_TO_STRUCT_CONCRETE, 0x991 | PALETTE_TO_STRUCT_CONCRETE, 0x993 | PALETTE_TO_STRUCT_CONCRETE,
 x10E7 | PALETTE_TO_STRUCT_CONCRETE, 0x10E9 | PALETTE_TO_STRUCT_CONCRETE, 0x10E6 | PALETTE_TO_STRUCT_CONCRETE, 0x10E8 | PALETTE_TO_STRUCT_CONCRETE, 0x10EB | PALETTE_TO_STRUCT_CONCRETE, 0x10ED | PALETTE_TO_STRUCT_CONCRETE, 0x10EA | PALETTE_TO_STRUCT_CONCRETE, 0x10EC | PALETTE_TO_STRUCT_CONCRETE,
 x110F | PALETTE_TO_STRUCT_CONCRETE, 0x1111 | PALETTE_TO_STRUCT_CONCRETE, 0x110E | PALETTE_TO_STRUCT_CONCRETE, 0x1110 | PALETTE_TO_STRUCT_CONCRETE, 0x1113 | PALETTE_TO_STRUCT_CONCRETE, 0x1115 | PALETTE_TO_STRUCT_CONCRETE, 0x1112 | PALETTE_TO_STRUCT_CONCRETE, 0x1114 | PALETTE_TO_STRUCT_CONCRETE,
-x0, SPR_OPENTTD_BASE + 35,
+x0, SPR_PILLARS_BASE + 2,
 };
 static const PalSpriteID _bridge_sprite_table_3_poles[] = {
 	SPR_OPENTTD_BASE + 36 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 37 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 37 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 36 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 38 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 4 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 4 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 5 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 x0,
 	SPR_OPENTTD_BASE + 33 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 34 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 34 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 33 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_OPENTTD_BASE + 35 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 1 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 1 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 	SPR_PILLARS_BASE + 6 * 0 + 2 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_CONCRETE),
 x0,
 x0,
 x0,
 };
@@ @@ -280,24 +280,24 @@ static const PalSpriteID _bridge_sprite_ @@
 x98E | PALETTE_TO_STRUCT_RED, 0x990 | PALETTE_TO_STRUCT_RED, 0x98D | PALETTE_TO_STRUCT_RED, 0x98F | PALETTE_TO_STRUCT_RED, 0x992 | PALETTE_TO_STRUCT_RED, 0x994 | PALETTE_TO_STRUCT_RED, 0x991 | PALETTE_TO_STRUCT_RED, 0x993 | PALETTE_TO_STRUCT_RED,
 x10E7 | PALETTE_TO_STRUCT_RED, 0x10E9 | PALETTE_TO_STRUCT_RED, 0x10E6 | PALETTE_TO_STRUCT_RED, 0x10E8 | PALETTE_TO_STRUCT_RED, 0x10EB | PALETTE_TO_STRUCT_RED, 0x10ED | PALETTE_TO_STRUCT_RED, 0x10EA | PALETTE_TO_STRUCT_RED, 0x10EC | PALETTE_TO_STRUCT_RED,
 x110F | PALETTE_TO_STRUCT_RED, 0x1111 | PALETTE_TO_STRUCT_RED, 0x110E | PALETTE_TO_STRUCT_RED, 0x1110 | PALETTE_TO_STRUCT_RED, 0x1113 | PALETTE_TO_STRUCT_RED, 0x1115 | PALETTE_TO_STRUCT_RED, 0x1112 | PALETTE_TO_STRUCT_RED, 0x1114 | PALETTE_TO_STRUCT_RED,
 };
 static const PalSpriteID _bridge_sprite_table_1_poles[] = {
 	SPR_OPENTTD_BASE + 36 + 6*3,
 	SPR_OPENTTD_BASE + 37 + 6*3,
 	SPR_OPENTTD_BASE + 37 + 6*3,
 	SPR_OPENTTD_BASE + 36 + 6*3,
 	SPR_OPENTTD_BASE + 38 + 6*3,
 	SPR_PILLARS_BASE + 6 * 3 + 3,
 	SPR_PILLARS_BASE + 6 * 3 + 4,
 	SPR_PILLARS_BASE + 6 * 3 + 4,
 	SPR_PILLARS_BASE + 6 * 3 + 3,
 	SPR_PILLARS_BASE + 6 * 3 + 5,
 x0,
 	SPR_OPENTTD_BASE + 33 + 6*3,
 	SPR_OPENTTD_BASE + 34 + 6*3,
 	SPR_OPENTTD_BASE + 34 + 6*3,
 	SPR_OPENTTD_BASE + 33 + 6*3,
 	SPR_OPENTTD_BASE + 35 + 6*3,
 	SPR_PILLARS_BASE + 6 * 3 + 0,
 	SPR_PILLARS_BASE + 6 * 3 + 1,
 	SPR_PILLARS_BASE + 6 * 3 + 1,
 	SPR_PILLARS_BASE + 6 * 3 + 0,
 	SPR_PILLARS_BASE + 6 * 3 + 2,
 x0,
 x0,
 x0,
 };
@@ @@ -456,24 +456,24 @@ static const PalSpriteID _bridge_sprite_ @@
 x9E6,     0x9E5,     0x9E8,     0x9E7,     0x9E2,     0x9E1,     0x9E3,     0x9E4,
 x1105,    0x1104,    0x1107,    0x1106,    0x1101,    0x1100,    0x1102,    0x1103,
 x112D,    0x112C,    0x112F,    0x112E,    0x1129,    0x1128,    0x112A,    0x112B,
 };
 static const PalSpriteID _bridge_sprite_table_0_poles[] = {
 	SPR_OPENTTD_BASE + 42,
 	SPR_OPENTTD_BASE + 42,
 	SPR_OPENTTD_BASE + 42,
 	SPR_OPENTTD_BASE + 42,
 	SPR_OPENTTD_BASE + 44,
 	SPR_PILLARS_BASE + 6 * 1 + 3,
 	SPR_PILLARS_BASE + 6 * 1 + 3,
 	SPR_PILLARS_BASE + 6 * 1 + 3,
 	SPR_PILLARS_BASE + 6 * 1 + 3,
 	SPR_PILLARS_BASE + 6 * 1 + 5,
 x0,
 	SPR_OPENTTD_BASE + 39,
 	SPR_OPENTTD_BASE + 39,
 	SPR_OPENTTD_BASE + 39,
 	SPR_OPENTTD_BASE + 39,
 	SPR_OPENTTD_BASE + 41,
 	SPR_PILLARS_BASE + 6 * 1 + 0,
 	SPR_PILLARS_BASE + 6 * 1 + 0,
 	SPR_PILLARS_BASE + 6 * 1 + 0,
 	SPR_PILLARS_BASE + 6 * 1 + 0,
 	SPR_PILLARS_BASE + 6 * 1 + 2,
 x0,
 x0,
 x0,
 };
@@ @@ -511,24 +511,24 @@ static const PalSpriteID _bridge_sprite_ @@
 xA10,     0xA00,     0xA06,       0x0,     0xA13,     0xA03,     0xA07,       0x0,
 xA16,     0xA00,     0xA06,       0x0,     0xA19,     0xA03,     0xA07,       0x0,
 xA1C,     0xA00,     0xA06,       0x0,     0xA1F,     0xA03,     0xA07,       0x0,
 };
 static const PalSpriteID _bridge_sprite_table_10_poles[] = {
 	SPR_OPENTTD_BASE + 36 + 2*6,
 	SPR_OPENTTD_BASE + 36 + 2*6,
 	SPR_OPENTTD_BASE + 36 + 2*6,
 	SPR_OPENTTD_BASE + 36 + 2*6,
 	SPR_OPENTTD_BASE + 38 + 2*6,
 	SPR_PILLARS_BASE + 6 * 2 + 3,
 	SPR_PILLARS_BASE + 6 * 2 + 3,
 	SPR_PILLARS_BASE + 6 * 2 + 3,
 	SPR_PILLARS_BASE + 6 * 2 + 3,
 	SPR_PILLARS_BASE + 6 * 2 + 5,
 x0,
 	SPR_OPENTTD_BASE + 33 + 2*6,
 	SPR_OPENTTD_BASE + 33 + 2*6,
 	SPR_OPENTTD_BASE + 33 + 2*6,
 	SPR_OPENTTD_BASE + 33 + 2*6,
 	SPR_OPENTTD_BASE + 35 + 2*6,
 	SPR_PILLARS_BASE + 6 * 2 + 0,
 	SPR_PILLARS_BASE + 6 * 2 + 0,
 	SPR_PILLARS_BASE + 6 * 2 + 0,
 	SPR_PILLARS_BASE + 6 * 2 + 0,
 	SPR_PILLARS_BASE + 6 * 2 + 2,
 x0,
 x0,
 x0,
 };
@@ @@ -551,24 +551,24 @@ static const PalSpriteID _bridge_sprite_ @@
 xA10 | PALETTE_TO_STRUCT_YELLOW,     0xA00 | PALETTE_TO_STRUCT_YELLOW,     0xA06 | PALETTE_TO_STRUCT_YELLOW,       0x0,     0xA13 | PALETTE_TO_STRUCT_YELLOW,     0xA03 | PALETTE_TO_STRUCT_YELLOW,     0xA07 | PALETTE_TO_STRUCT_YELLOW,       0x0,
 xA16 | PALETTE_TO_STRUCT_YELLOW,     0xA00 | PALETTE_TO_STRUCT_YELLOW,     0xA06 | PALETTE_TO_STRUCT_YELLOW,       0x0,     0xA19 | PALETTE_TO_STRUCT_YELLOW,     0xA03 | PALETTE_TO_STRUCT_YELLOW,     0xA07 | PALETTE_TO_STRUCT_YELLOW,       0x0,
 xA1C | PALETTE_TO_STRUCT_YELLOW,     0xA00 | PALETTE_TO_STRUCT_YELLOW,     0xA06 | PALETTE_TO_STRUCT_YELLOW,       0x0,     0xA1F | PALETTE_TO_STRUCT_YELLOW,     0xA03 | PALETTE_TO_STRUCT_YELLOW,     0xA07 | PALETTE_TO_STRUCT_YELLOW,       0x0,
 };
 static const PalSpriteID _bridge_sprite_table_11_poles[] = {
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 38 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 5 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 x0,
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_OPENTTD_BASE + 35 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 	SPR_PILLARS_BASE + 6 * 2 + 2 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_YELLOW),
 x0,
 x0,
 x0,
 };
@@ @@ -591,24 +591,24 @@ static const PalSpriteID _bridge_sprite_ @@
 xA10 | PALETTE_TO_STRUCT_GREY,     0xA00 | PALETTE_TO_STRUCT_GREY,     0xA06 | PALETTE_TO_STRUCT_GREY,       0x0,     0xA13 | PALETTE_TO_STRUCT_GREY,     0xA03 | PALETTE_TO_STRUCT_GREY,     0xA07 | PALETTE_TO_STRUCT_GREY,       0x0,
 xA16 | PALETTE_TO_STRUCT_GREY,     0xA00 | PALETTE_TO_STRUCT_GREY,     0xA06 | PALETTE_TO_STRUCT_GREY,       0x0,     0xA19 | PALETTE_TO_STRUCT_GREY,     0xA03 | PALETTE_TO_STRUCT_GREY,     0xA07 | PALETTE_TO_STRUCT_GREY,       0x0,
 xA1C | PALETTE_TO_STRUCT_GREY,     0xA00 | PALETTE_TO_STRUCT_GREY,     0xA06 | PALETTE_TO_STRUCT_GREY,       0x0,     0xA1F | PALETTE_TO_STRUCT_GREY,     0xA03 | PALETTE_TO_STRUCT_GREY,     0xA07 | PALETTE_TO_STRUCT_GREY,       0x0,
 };
 static const PalSpriteID _bridge_sprite_table_12_poles[] = {
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 36 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 38 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 3 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 5 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 x0,
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 33 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_OPENTTD_BASE + 35 + 2*6 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 0 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 	SPR_PILLARS_BASE + 6 * 2 + 2 + (PALETTE_MODIFIER_COLOR | PALETTE_TO_STRUCT_GREY),
 x0,
 x0,
 x0,
 };

table/sprites.h

➞

Show inline comments

@@ @@ -424,12 +424,13 @@ enum Sprites { @@
 	/* Level crossings */
 	SPR_CROSSING_OFF_X_RAIL   = 1370,
 	SPR_CROSSING_OFF_X_MONO   = 1382,
 	SPR_CROSSING_OFF_X_MAGLEV = 1394,
 	/* bridge type sprites */
 	SPR_PILLARS_BASE = SPR_OPENTTD_BASE + 33,
 	/* Wooden bridge (type 0) */
 	SPR_BTWDN_RAIL_Y_REAR				= 2545,
 	SPR_BTWDN_RAIL_X_REAR				= 2546,
 	SPR_BTWDN_ROAD_Y_REAR				= 2547,
 	SPR_BTWDN_ROAD_X_REAR				= 2548,
@@ @@ -888,13 +889,32 @@ enum Sprites { @@
 	SPR_IMG_ROAD_NE				= 1310,
 	SPR_IMG_ROAD_DEPOT		= 1295,
 	SPR_IMG_BUS_STATION		= 749,
 	SPR_IMG_TRUCK_BAY			= 750,
 	SPR_IMG_BRIDGE				= 2594,
 	SPR_IMG_ROAD_TUNNEL		= 2429,
 	SPR_IMG_REMOVE				= 714
 	SPR_IMG_REMOVE				= 714,
 	/* rail_gui.c */
 	SPR_IMG_AUTORAIL   = SPR_OPENTTD_BASE + 0,
 	SPR_IMG_AUTOMONO   = SPR_OPENTTD_BASE + 1,
 	SPR_IMG_AUTOMAGLEV = SPR_OPENTTD_BASE + 2,
 	SPR_IMG_WAYPOINT = SPR_OPENTTD_BASE + 3,
 	SPR_IMG_DEPOT_RAIL   = 1294,
 	SPR_IMG_DEPOT_MONO   = SPR_OPENTTD_BASE + 12,
 	SPR_IMG_DEPOT_MAGLEV = SPR_OPENTTD_BASE + 13,
 	SPR_IMG_TUNNEL_RAIL   = 2430,
 	SPR_IMG_TUNNEL_MONO   = 2431,
 	SPR_IMG_TUNNEL_MAGLEV = 2432,
 	SPR_IMG_CONVERT_RAIL   = SPR_OPENTTD_BASE + 25,
 	SPR_IMG_CONVERT_MONO   = SPR_OPENTTD_BASE + 27,
 	SPR_IMG_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 29
 };
 /** Cursor sprite numbers */
 typedef enum CursorSprites {
 	/* Terraform */
 	/* Cursors */

table/station_land.h

➞

Show inline comments

@@ @@ -670,13 +670,13 @@ const DrawTileSeqStruct _station_display @@
 };
 //END
 // helipad for international airport
 // concrete underground
 const DrawTileSeqStruct _station_display_datas_0114[] = {
-	{ 10,  6, 0,  0, 0,  0, SPR_OPENTTD_BASE + 31 },	// helipad
+	{ 10,  6, 0,  0, 0,  0, SPR_AIRPORT_HELIPAD },
 	{ 15,  0,  0,  1, 16,  6, 0xA67 | PALETTE_MODIFIER_COLOR },	// fences bottom
 	TILE_SEQ_END()
 };
 static const DrawTileSprites _station_display_datas[] = {
 	{ 0x3F4, _station_display_datas_0 },

table/track_land.h

➞

Show inline comments

@@ @@ -37,21 +37,21 @@ static const DrawTrackSeqStruct _track_d @@
 	TILE_SEQ_LINE(0x42C | PALETTE_MODIFIER_COLOR, 13, 2, 1, 13)
 	TILE_SEQ_END()
 };
 static const DrawTrackSeqStruct _track_waypoint_table_0[] = {
 	TILE_SEQ_BEGIN(0x3F4 | PALETTE_MODIFIER_COLOR)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 18),  0,  0,  16,  5)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 19),  0, 11,  16,  5)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_1,  0,  0,  16,  5)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_X_2,  0, 11,  16,  5)
 	TILE_SEQ_END()
 };
 static const DrawTrackSeqStruct _track_waypoint_table_1[] = {
 	TILE_SEQ_BEGIN(0x3F3 | PALETTE_MODIFIER_COLOR)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 20),   0,  0, 5, 16)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | (SPR_OPENTTD_BASE + 21),  11,  0, 5, 16)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_1,   0,  0, 5, 16)
 	TILE_SEQ_LINE(PALETTE_MODIFIER_COLOR | SPR_WAYPOINT_Y_2,  11,  0, 5, 16)
 	TILE_SEQ_END()
 };
 static const DrawTrackSeqStruct* const _track_depot_layout_table[] = {
 	_track_depot_layout_table_0,

0 comments (0 inline, 0 general)