(svn r9814) -Fix (r1): Remove the duplicate sign sprite from openttd.grf since it's in the original data files.

5 files changed, 37 insertions, 38 deletions

diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
index 30f54a294..b2c6bf892 100644
--- a/bin/data/openttd.grf
+++ b/bin/data/openttd.grf
diff --git a/src/table/files.h b/src/table/files.h
index fca534a35..3a2cb6d1e 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",   { 0x10, 0xc1, 0x68, 0x56, 0x9e, 0x1e, 0x0e, 0x85, 0x9d, 0xf8, 0x53, 0x27, 0x48, 0x7e, 0x17, 0x58 } },
+	{ "openttd.grf",   { 0x85, 0x4f, 0xf6, 0xb5, 0xd2, 0xf7, 0xbc, 0x1e, 0xb9, 0xdc, 0x44, 0xef, 0x35, 0x5f, 0x64, 0x9b } },
 	{ "trkfoundw.grf", { 0x12, 0x33, 0x3f, 0xa3, 0xd1, 0x86, 0x8b, 0x04, 0x53, 0x18, 0x9c, 0xee, 0xf9, 0x2d, 0xf5, 0x95 } },
 	{ "roadstops.grf", { 0x8c, 0xd9, 0x45, 0x21, 0x28, 0x82, 0x96, 0x45, 0x33, 0x22, 0x7a, 0xb9, 0x0d, 0xf3, 0x67, 0x4a } },
 };
diff --git a/src/table/sprites.h b/src/table/sprites.h
index da80b4954..a1a12e5ad 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 = 117, // number of gfx-sprites in openttd.grf
+	OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf
 	SPR_SIGNALS_BASE  = 4896,
 	SPR_CANALS_BASE   = SPR_SIGNALS_BASE + 486,
 	SPR_SLOPES_BASE   = SPR_CANALS_BASE + 70,
@@ -62,44 +62,44 @@ enum Sprites {
 	SPR_PIN_DOWN      = SPR_OPENTTD_BASE + 56,
 	SPR_BOX_EMPTY     = SPR_OPENTTD_BASE + 59,
 	SPR_BOX_CHECKED   = SPR_OPENTTD_BASE + 60,
-	SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 87,   // resize icon
-	SPR_HOUSE_ICON    = SPR_OPENTTD_BASE + 94,
+	SPR_WINDOW_RESIZE = SPR_OPENTTD_BASE + 86,   // resize icon
+	SPR_HOUSE_ICON    = SPR_OPENTTD_BASE + 93,
 	// arrow icons pointing in all 4 directions
-	SPR_ARROW_DOWN    = SPR_OPENTTD_BASE + 88,
-	SPR_ARROW_UP      = SPR_OPENTTD_BASE + 89,
-	SPR_ARROW_LEFT    = SPR_OPENTTD_BASE + 90,
-	SPR_ARROW_RIGHT   = SPR_OPENTTD_BASE + 91,
+	SPR_ARROW_DOWN    = SPR_OPENTTD_BASE + 87,
+	SPR_ARROW_UP      = SPR_OPENTTD_BASE + 88,
+	SPR_ARROW_LEFT    = SPR_OPENTTD_BASE + 89,
+	SPR_ARROW_RIGHT   = SPR_OPENTTD_BASE + 90,
 
 	SPR_LARGE_SMALL_WINDOW = 682,
 
 	/* Clone vehicles stuff */
-	SPR_CLONE_TRAIN    = SPR_OPENTTD_BASE + 92,
-	SPR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 109,
-	SPR_CLONE_SHIP     = SPR_OPENTTD_BASE + 111,
-	SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 113,
-
-	SPR_SELL_TRAIN        = SPR_OPENTTD_BASE + 96,
-	SPR_SELL_ROADVEH      = SPR_OPENTTD_BASE + 97,
-	SPR_SELL_SHIP         = SPR_OPENTTD_BASE + 98,
-	SPR_SELL_AIRCRAFT     = SPR_OPENTTD_BASE + 99,
-	SPR_SELL_ALL_TRAIN    = SPR_OPENTTD_BASE + 100,
-	SPR_SELL_ALL_ROADVEH  = SPR_OPENTTD_BASE + 101,
-	SPR_SELL_ALL_SHIP     = SPR_OPENTTD_BASE + 102,
-	SPR_SELL_ALL_AIRCRAFT = SPR_OPENTTD_BASE + 103,
-	SPR_REPLACE_TRAIN     = SPR_OPENTTD_BASE + 104,
-	SPR_REPLACE_ROADVEH   = SPR_OPENTTD_BASE + 105,
-	SPR_REPLACE_SHIP      = SPR_OPENTTD_BASE + 106,
-	SPR_REPLACE_AIRCRAFT  = SPR_OPENTTD_BASE + 107,
-	SPR_SELL_CHAIN_TRAIN  = SPR_OPENTTD_BASE + 108,
-
-	SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 115,
-
-	SPR_WARNING_SIGN      = SPR_OPENTTD_BASE + 116, // warning sign (shown if there are any newgrf errors)
+	SPR_CLONE_TRAIN    = SPR_OPENTTD_BASE + 91,
+	SPR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 108,
+	SPR_CLONE_SHIP     = SPR_OPENTTD_BASE + 110,
+	SPR_CLONE_AIRCRAFT = SPR_OPENTTD_BASE + 112,
+
+	SPR_SELL_TRAIN        = SPR_OPENTTD_BASE + 95,
+	SPR_SELL_ROADVEH      = SPR_OPENTTD_BASE + 96,
+	SPR_SELL_SHIP         = SPR_OPENTTD_BASE + 97,
+	SPR_SELL_AIRCRAFT     = SPR_OPENTTD_BASE + 98,
+	SPR_SELL_ALL_TRAIN    = SPR_OPENTTD_BASE + 99,
+	SPR_SELL_ALL_ROADVEH  = SPR_OPENTTD_BASE + 100,
+	SPR_SELL_ALL_SHIP     = SPR_OPENTTD_BASE + 101,
+	SPR_SELL_ALL_AIRCRAFT = SPR_OPENTTD_BASE + 102,
+	SPR_REPLACE_TRAIN     = SPR_OPENTTD_BASE + 103,
+	SPR_REPLACE_ROADVEH   = SPR_OPENTTD_BASE + 104,
+	SPR_REPLACE_SHIP      = SPR_OPENTTD_BASE + 105,
+	SPR_REPLACE_AIRCRAFT  = SPR_OPENTTD_BASE + 106,
+	SPR_SELL_CHAIN_TRAIN  = SPR_OPENTTD_BASE + 107,
+
+	SPR_SHARED_ORDERS_ICON = SPR_OPENTTD_BASE + 114,
+
+	SPR_WARNING_SIGN      = SPR_OPENTTD_BASE + 115, // warning sign (shown if there are any newgrf errors)
 
 	/* Network GUI sprites */
 	SPR_SQUARE = SPR_OPENTTD_BASE + 20,     // colored square (used for newgrf compatibility)
 	SPR_LOCK = SPR_OPENTTD_BASE + 19,       // lock icon (for password protected servers)
-	SPR_FLAGS_BASE = SPR_OPENTTD_BASE + 83, // start of the flags block (in same order as enum NetworkLanguage)
+	SPR_FLAGS_BASE = SPR_OPENTTD_BASE + 82, // start of the flags block (in same order as enum NetworkLanguage)
 
 	SPR_AIRPORTX_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // The sprites used for other airport angles
 	SPR_NEWAIRPORT_TARMAC = SPR_AIRPORTX_BASE,
@@ -940,7 +940,6 @@ enum Sprites {
 	SPR_IMG_LEVEL_LAND      = SPR_OPENTTD_BASE + 61,
 	SPR_IMG_BUILD_CANAL     = SPR_OPENTTD_BASE + 58,
 	SPR_IMG_BUILD_LOCK      = SPR_CANALS_BASE + 69,
-	SPR_IMG_PLACE_SIGN      = SPR_OPENTTD_BASE + 63,
 	SPR_IMG_PAUSE           = 726,
 	SPR_IMG_FASTFORWARD     = SPR_OPENTTD_BASE + 54,
 	SPR_IMG_SETTINGS        = 751,
@@ -1279,10 +1278,10 @@ enum CursorSprite {
 	SPR_CURSOR_TRUCK_STATION  = 2726,
 	SPR_CURSOR_ROAD_TUNNEL    = 2433,
 
-	SPR_CURSOR_CLONE_TRAIN    = SPR_OPENTTD_BASE +  93,
-	SPR_CURSOR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 110,
-	SPR_CURSOR_CLONE_SHIP     = SPR_OPENTTD_BASE + 112,
-	SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 114,
+	SPR_CURSOR_CLONE_TRAIN    = SPR_OPENTTD_BASE +  92,
+	SPR_CURSOR_CLONE_ROADVEH  = SPR_OPENTTD_BASE + 109,
+	SPR_CURSOR_CLONE_SHIP     = SPR_OPENTTD_BASE + 111,
+	SPR_CURSOR_CLONE_AIRPLANE = SPR_OPENTTD_BASE + 113,
 };
 
 /// Animation macro in table/animcursors.h (_animcursors[])
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 3cf5bd393..cb3c2aa81 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -267,7 +267,7 @@ static const Widget _terraform_widgets[] = {
 {   WWT_IMGBTN,   RESIZE_NONE,     7,  70,  91,  14,  35, SPR_IMG_DYNAMITE,        STR_018D_DEMOLISH_BUILDINGS_ETC},
 {   WWT_IMGBTN,   RESIZE_NONE,     7,  92, 113,  14,  35, SPR_IMG_BUY_LAND,        STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {   WWT_IMGBTN,   RESIZE_NONE,     7, 114, 135,  14,  35, SPR_IMG_PLANTTREES,      STR_0185_PLANT_TREES_PLACE_SIGNS},
-{   WWT_IMGBTN,   RESIZE_NONE,     7, 136, 157,  14,  35, SPR_IMG_PLACE_SIGN,      STR_0289_PLACE_SIGN},
+{   WWT_IMGBTN,   RESIZE_NONE,     7, 136, 157,  14,  35, SPR_IMG_SIGN,            STR_0289_PLACE_SIGN},
 
 {   WIDGETS_END},
 };
diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp
index 01fc4ab13..889e117f1 100644
--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@@ -64,7 +64,7 @@ static const Widget _transparency_widgets[] = {
 
 /* transparency widgets:
  * transparent signs, trees, houses, industries, player's buildings, bridges and unmovable structures */
-{   WWT_IMGBTN,   RESIZE_NONE,  7,   0,  21,  14,  35, SPR_IMG_PLACE_SIGN,   STR_TRANSPARENT_SIGNS_DESC},
+{   WWT_IMGBTN,   RESIZE_NONE,  7,   0,  21,  14,  35, SPR_IMG_SIGN,         STR_TRANSPARENT_SIGNS_DESC},
 {   WWT_IMGBTN,   RESIZE_NONE,  7,  22,  43,  14,  35, SPR_IMG_PLANTTREES,   STR_TRANSPARENT_TREES_DESC},
 {   WWT_IMGBTN,   RESIZE_NONE,  7,  44,  65,  14,  35, SPR_IMG_TOWN,         STR_TRANSPARENT_HOUSES_DESC},
 {   WWT_IMGBTN,   RESIZE_NONE,  7,  66,  87,  14,  35, SPR_IMG_INDUSTRY,     STR_TRANSPARENT_INDUSTRIES_DESC},