From c0747d26f0a10ad36a24bfc085ea985a53b79cfb Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Sat, 27 Oct 2007 11:23:13 +0000
Subject: [PATCH] (svn r11350) -Change: add missing elrail sprites for some
 rail build buttons/cursors. Sprites by skidd13.

---
 bin/data/openttd.grf | Bin 31847 -> 34441 bytes
 src/gfxinit.cpp      |   2 +-
 src/railtypes.h      |  12 ++++++------
 src/table/files.h    |   2 +-
 src/table/sprites.h  |   8 +++++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
index 627c602bca617e6a5ff9ea7ab15051b89a999922..7dce5a2d3b98df644dcbfc3489ddc99bf8b610f1 100644
GIT binary patch
delta 2344
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
X1Eo`DMa8eXry`|OPM#Mr3}65Nqs`~G

delta 396
zcmeC|WqSUDaf2r>W5#AL-fzr&{ZIS9bVT%@>A&6o>io~mPJ;GKj4vj4v{Y~YE9}F_
zz9XhXeuMmr%|4=vOl%O&=6rE)LB^KJyER@2F)1)~2)z*MFlG9h^)kJ~;)TWJMB5pg
zZMAB67&A8SGW*1WX2Ilj);k&9Cui8mvLDdCp?|{6eR7A58Pf@l&HHQuR2gF?^C!*W
z-pM;bphLgI=wSeeZ#?;7QW1BDz)2Z|nDXSx<R<P7f*nZev?pt(Byx8MtbmFYOzurN
z#<fGBL$E`ciGiVDa#-qV_71@nf*r~QlU35Lvab;85S*c0F!@i~Hues|34#lh3nstI
zke+-Yy@|6!p+l+DWrqn&L~wF_Mh^D{C5ZTeFp&5*?h~O9{s}N2q?2><>C9Rb@!k}#
Y$y2im*g6DP2CdNA%$|K#fQ<nR0706fMgRZ+

diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
index b1f22fe3ae..a04402bc32 100644
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -324,7 +324,7 @@ static const SpriteID _openttd_grf_indexes[] = {
 	377, 377, ///<  · small
 	153, 153, ///<  · medium
 	601, 601, ///<  · large
-	SPR_WARNING_SIGN, SPR_CURSOR_AUTOTRAM,
+	SPR_WARNING_SIGN, SPR_CURSOR_ELRAIL_DEPOT,
 	END
 };
 
diff --git a/src/railtypes.h b/src/railtypes.h
index 6695a661c1..d456d66ac9 100644
--- a/src/railtypes.h
+++ b/src/railtypes.h
@@ -73,10 +73,10 @@ RailtypeInfo _railtypes[] = {
 			SPR_BUILD_X_ELRAIL,
 			SPR_BUILD_EW_ELRAIL,
 			SPR_BUILD_Y_ELRAIL,
-			SPR_OPENTTD_BASE + 0,
-			0x50E,
+			SPR_IMG_AUTOELRAIL,
+			SPR_IMG_DEPOT_ELRAIL,
 			SPR_BUILD_TUNNEL_ELRAIL,
-			SPR_IMG_CONVERT_RAIL
+			SPR_IMG_CONVERT_ELRAIL
 		},
 
 		{
@@ -84,10 +84,10 @@ RailtypeInfo _railtypes[] = {
 			SPR_CURSOR_SWNE_ELRAIL,
 			SPR_CURSOR_EW_ELRAIL,
 			SPR_CURSOR_NWSE_ELRAIL,
-			SPR_CURSOR_AUTORAIL,
-			SPR_CURSOR_RAIL_DEPOT,
+			SPR_CURSOR_AUTOELRAIL,
+			SPR_CURSOR_ELRAIL_DEPOT,
 			SPR_CURSOR_TUNNEL_ELRAIL,
-			SPR_CURSOR_CONVERT_RAIL
+			SPR_CURSOR_CONVERT_ELRAIL
 		},
 
 		/* strings */
diff --git a/src/table/files.h b/src/table/files.h
index 40b2645f80..8ece007354 100644
--- a/src/table/files.h
+++ b/src/table/files.h
@@ -59,7 +59,7 @@ static MD5File files_openttd[] = {
 	{ "autorail.grf",  { 0xed, 0x44, 0x7f, 0xbb, 0x19, 0x44, 0x48, 0x4c, 0x07, 0x8a, 0xb1, 0xc1, 0x5c, 0x12, 0x3a, 0x60 } },
 	{ "canalsw.grf",   { 0x13, 0x9c, 0x98, 0xcf, 0xb8, 0x7c, 0xd7, 0x1f, 0xca, 0x34, 0xa5, 0x6b, 0x65, 0x31, 0xec, 0x0f } },
 	{ "elrailsw.grf",  { 0x4f, 0xf9, 0xac, 0x79, 0x50, 0x28, 0x9b, 0xe2, 0x15, 0x30, 0xa8, 0x1e, 0xd5, 0xfd, 0xe1, 0xda } },
-	{ "openttd.grf",   { 0x95, 0xe3, 0x09, 0xe4, 0x2c, 0x2d, 0x47, 0x80, 0xd2, 0x09, 0x06, 0x64, 0xaf, 0x20, 0x32, 0x14 } },
+	{ "openttd.grf",   { 0x16, 0x5c, 0x0f, 0xba, 0x63, 0x6a, 0x77, 0x30, 0x44, 0xb0, 0x32, 0xe6, 0x4a, 0xc7, 0x90, 0x58 } },
 	{ "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } },
 	{ "roadstops.grf", { 0xa1, 0x5b, 0xb3, 0x52, 0x60, 0x12, 0x3c, 0xb7, 0x7b, 0x73, 0x09, 0xc1, 0x1a, 0xb4, 0xd0, 0xb8 } },
 	{ "group.grf",     { 0xe8, 0x52, 0x5f, 0x1c, 0x3e, 0xf9, 0x91, 0x9d, 0x0f, 0x70, 0x8c, 0x8a, 0x21, 0xa4, 0xc7, 0x02 } },
diff --git a/src/table/sprites.h b/src/table/sprites.h
index 9caff36f2e..39fee27b8a 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -47,7 +47,7 @@ enum Sprites {
 	SPR_ASCII_SPACE_BIG   = 450,
 
 	/* Extra graphic spritenumbers */
-	OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf
+	OPENTTD_SPRITES_COUNT = 122, // number of gfx-sprites in openttd.grf
 	SPR_SIGNALS_BASE  = 4896,
 	SPR_CANALS_BASE   = SPR_SIGNALS_BASE + 486,
 
@@ -1242,12 +1242,14 @@ enum Sprites {
 	SPR_IMG_RAIL_EW    = 1253,
 	SPR_IMG_RAIL_NW    = 1254,
 	SPR_IMG_AUTORAIL   = SPR_OPENTTD_BASE + 0,
+	SPR_IMG_AUTOELRAIL = SPR_OPENTTD_BASE + 116,
 	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_ELRAIL = SPR_OPENTTD_BASE + 120,
 	SPR_IMG_DEPOT_MONO   = SPR_OPENTTD_BASE + 9,
 	SPR_IMG_DEPOT_MAGLEV = SPR_OPENTTD_BASE + 10,
 
@@ -1259,6 +1261,7 @@ enum Sprites {
 	SPR_IMG_TUNNEL_MAGLEV = 2432,
 
 	SPR_IMG_CONVERT_RAIL   = SPR_OPENTTD_BASE + 22,
+	SPR_IMG_CONVERT_ELRAIL = SPR_OPENTTD_BASE + 118,
 	SPR_IMG_CONVERT_MONO   = SPR_OPENTTD_BASE + 24,
 	SPR_IMG_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 26,
 
@@ -1335,16 +1338,19 @@ enum CursorSprite {
 	SPR_CURSOR_TUNNEL_MAGLEV  = 2436,
 
 	SPR_CURSOR_AUTORAIL       = SPR_OPENTTD_BASE + 4,
+	SPR_CURSOR_AUTOELRAIL     = SPR_OPENTTD_BASE + 117,
 	SPR_CURSOR_AUTOMONO       = SPR_OPENTTD_BASE + 5,
 	SPR_CURSOR_AUTOMAGLEV     = SPR_OPENTTD_BASE + 6,
 
 	SPR_CURSOR_WAYPOINT       = SPR_OPENTTD_BASE + 7,
 
 	SPR_CURSOR_RAIL_DEPOT     = 1296,
+	SPR_CURSOR_ELRAIL_DEPOT   = SPR_OPENTTD_BASE + 121,
 	SPR_CURSOR_MONO_DEPOT     = SPR_OPENTTD_BASE + 11,
 	SPR_CURSOR_MAGLEV_DEPOT   = SPR_OPENTTD_BASE + 12,
 
 	SPR_CURSOR_CONVERT_RAIL   = SPR_OPENTTD_BASE + 23,
+	SPR_CURSOR_CONVERT_ELRAIL = SPR_OPENTTD_BASE + 119,
 	SPR_CURSOR_CONVERT_MONO   = SPR_OPENTTD_BASE + 25,
 	SPR_CURSOR_CONVERT_MAGLEV = SPR_OPENTTD_BASE + 27,