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

8 files changed, 151 insertions, 119 deletions

diff --git a/gfxinit.c b/gfxinit.c
index a19d3d543..adfbce756 100644
--- a/gfxinit.c
+++ b/gfxinit.c
@@ -273,16 +273,16 @@ static const SpriteID trg1idx[] = {
  * 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, 134,  // euro symbol medium size
 	582, 582,  // euro symbol large size
 	358, 358,  // euro symbol tiny
-	SPR_OPENTTD_BASE+11, SPR_OPENTTD_BASE+57, // more icons
+	SPR_CURSOR_CANAL, SPR_IMG_FASTFORWARD, // more icons
 	648, 648, // nordic char: æ
 	616, 616, // nordic char: Æ
 	666, 666, // nordic char: ø
 	634, 634, // nordic char: Ø
-	SPR_OPENTTD_BASE+62, SPR_OPENTTD_BASE + 100, // more icons
+	SPR_PIN_UP, SPR_CURSOR_CLONE, // more icons
 	382, 383, // ¼ ½ tiny
 	158, 159, // ¼ ½ medium
 	606, 607, // ¼ ½ large
@@ -308,7 +308,7 @@ static const SpriteID _openttd_grf_indexes[] = {
 	317, 320, // { | } ~ tiny
 	 93,  96, // { | } ~ medium
 	541, 544, // { | } ~ large
-	SPR_OPENTTD_BASE + 101, SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // icon (HOUSE)
+	SPR_HOUSE_ICON, SPR_HOUSE_ICON,
 	0xffff,
 };
 
diff --git a/main_gui.c b/main_gui.c
index ea0d59769..212d5f48b 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -1962,7 +1962,7 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
 
 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},
 
@@ -2016,7 +2016,7 @@ static const WindowDesc _toolb_intro_desc = {
 
 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},
 
diff --git a/rail_gui.c b/rail_gui.c
index 98c9d46d2..8fbf0e00a 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -495,18 +495,18 @@ static const Widget _build_rail_widgets[] = {
 {      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},
 
diff --git a/railtypes.h b/railtypes.h
index 3fb00178a..12180c352 100644
--- a/railtypes.h
+++ b/railtypes.h
@@ -17,7 +17,11 @@ const RailtypeInfo _railtypes[] = {
 
 		/* 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,
@@ -56,7 +60,11 @@ const RailtypeInfo _railtypes[] = {
 
 		/* 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,
@@ -95,7 +103,11 @@ const RailtypeInfo _railtypes[] = {
 
 		/* 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,
diff --git a/table/bridge_land.h b/table/bridge_land.h
index d3e35c231..a40055b60 100644
--- a/table/bridge_land.h
+++ b/table/bridge_land.h
@@ -45,18 +45,18 @@ static const PalSpriteID _bridge_sprite_table_2_1[] = {
 };
 
 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,
 	0x0,
 
-	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,
 	0x0,
 
 	0x0,
@@ -113,18 +113,18 @@ static const PalSpriteID _bridge_sprite_table_4_6[] = {
 };
 
 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,
 	0x0,
 
-	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,
 	0x0,
 
 	0x0,
@@ -136,7 +136,7 @@ static const PalSpriteID _bridge_sprite_table_5_0[] = {
 	0x99D | 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,
 	0x10F2 | 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,
 	0x111A | 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[] = {
@@ -144,7 +144,7 @@ static const PalSpriteID _bridge_sprite_table_5_1[] = {
 	0x99E | 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,
 	0x10F3 | 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,
 	0x111B | 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[] = {
@@ -152,7 +152,7 @@ static const PalSpriteID _bridge_sprite_table_5_2[] = {
 	0x9A2 | 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,
 	0x10F5 | 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,
 	0x111D | 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[] = {
@@ -160,7 +160,7 @@ static const PalSpriteID _bridge_sprite_table_5_3[] = {
 	0x9A1 | 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,
 	0x10F4 | 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,
 	0x111C | 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[] = {
@@ -168,7 +168,7 @@ static const PalSpriteID _bridge_sprite_table_5_4[] = {
 	0x9B8 | 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,
 	0x10F7 | 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,
 	0x111F | 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[] = {
@@ -176,7 +176,7 @@ static const PalSpriteID _bridge_sprite_table_5_5[] = {
 	0x9BF | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x9C0 | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
 	0x10F8 | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x10F9 | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
 	0x1120 | PALETTE_TO_STRUCT_YELLOW, 0x9C1 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0, 0x1121 | PALETTE_TO_STRUCT_YELLOW, 0x9C2 | PALETTE_TO_STRUCT_YELLOW,       0x0,       0x0,
-	0x0, SPR_OPENTTD_BASE + 35,
+	0x0, SPR_PILLARS_BASE + 2
 };
 
 static const PalSpriteID _bridge_sprite_table_5_6[] = {
@@ -184,22 +184,22 @@ static const PalSpriteID _bridge_sprite_table_5_6[] = {
 	0x98E | 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,
 	0x10E7 | 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,
 	0x110F | 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,
-	0x0, SPR_OPENTTD_BASE + 35,
+	0x0, 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),
 	0x0,
 
-	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),
 	0x0,
 
 	0x0,
@@ -253,22 +253,22 @@ static const PalSpriteID _bridge_sprite_table_3_6[] = {
 	0x98E | 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,
 	0x10E7 | 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,
 	0x110F | 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,
-	0x0, SPR_OPENTTD_BASE + 35,
+	0x0, 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),
 	0x0,
 
-	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),
 	0x0,
 
 	0x0,
@@ -283,18 +283,18 @@ static const PalSpriteID _bridge_sprite_table_1_1[] = {
 };
 
 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,
 	0x0,
 
-	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,
 	0x0,
 
 	0x0,
@@ -459,18 +459,18 @@ static const PalSpriteID _bridge_sprite_table_0_1[] = {
 };
 
 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,
 	0x0,
 
-	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,
 	0x0,
 
 	0x0,
@@ -514,18 +514,18 @@ static const PalSpriteID _bridge_sprite_table_10_2[] = {
 };
 
 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,
 	0x0,
 
-	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,
 	0x0,
 
 	0x0,
@@ -554,18 +554,18 @@ static const PalSpriteID _bridge_sprite_table_11_2[] = {
 };
 
 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),
 	0x0,
 
-	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),
 	0x0,
 
 	0x0,
@@ -594,18 +594,18 @@ static const PalSpriteID _bridge_sprite_table_12_2[] = {
 };
 
 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),
-	0x0,
-
-	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 + 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),
+	0x0,
+
+	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),
 	0x0,
 
 	0x0,
diff --git a/table/sprites.h b/table/sprites.h
index 585805342..5045be201 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -427,6 +427,7 @@ enum Sprites {
 	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,
@@ -891,7 +892,26 @@ enum Sprites {
 	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 */
diff --git a/table/station_land.h b/table/station_land.h
index e8ca47e27..6b27b6bc7 100644
--- a/table/station_land.h
+++ b/table/station_land.h
@@ -673,7 +673,7 @@ const DrawTileSeqStruct _station_display_datas_0113[] = {
 // 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()
 };
diff --git a/table/track_land.h b/table/track_land.h
index 6c535bf69..3ca8ca14b 100644
--- a/table/track_land.h
+++ b/table/track_land.h
@@ -40,15 +40,15 @@ static const DrawTrackSeqStruct _track_depot_layout_table_3[] = {
 
 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()
 };