(svn r1254) - Fix: [ 993500 ] High bridge rendering error
authordominik
Thu, 23 Dec 2004 18:14:12 +0000
changeset 787 6b53b25082d2
parent 786 aa75e1682d39
child 788 f7c5d8966d59
(svn r1254) - Fix: [ 993500 ] High bridge rendering error
- Changed button to open landscaping toolbar
airport_gui.c
data/openttd.grf
dock_gui.c
rail_gui.c
road_gui.c
table/sprites.h
--- a/airport_gui.c	Thu Dec 23 17:59:37 2004 +0000
+++ b/airport_gui.c	Thu Dec 23 18:14:12 2004 +0000
@@ -101,7 +101,7 @@
 {  WWT_STICKYBOX,     7,    74,    85,     0,    13, 0x0,                   STR_STICKY_BUTTON},
 {      WWT_PANEL,     7,     0,    41,    14,    35, 0x2E8,									STR_A01E_BUILD_AIRPORT},
 {      WWT_PANEL,     7,    42,    63,    14,    35, 0x2BF,									STR_018D_DEMOLISH_BUILDINGS_ETC},
-{      WWT_PANEL,     7,    64,    85,    14,    35, SPR_IMG_LANDSCAPING_S,	STR_LANDSCAPING_TOOLBAR_TIP},
+{      WWT_PANEL,     7,    64,    85,    14,    35, SPR_IMG_LANDSCAPING,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 
Binary file data/openttd.grf has changed
--- a/dock_gui.c	Thu Dec 23 17:59:37 2004 +0000
+++ b/dock_gui.c	Thu Dec 23 18:14:12 2004 +0000
@@ -176,7 +176,7 @@
 {      WWT_PANEL,     7,    70,    91,    14,    35, 748,													STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,    92,   113,    14,    35, 746,													STR_981D_BUILD_SHIP_DOCK},
 {      WWT_PANEL,     7,   114,   135,    14,    35, 693,													STR_9834_POSITION_BUOY_WHICH_CAN},
-{      WWT_PANEL,     7,   136,   157,    14,    35, SPR_IMG_LANDSCAPING_S,				STR_LANDSCAPING_TOOLBAR_TIP},
+{      WWT_PANEL,     7,   136,   157,    14,    35, SPR_IMG_LANDSCAPING,				STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 
--- a/rail_gui.c	Thu Dec 23 17:59:37 2004 +0000
+++ b/rail_gui.c	Thu Dec 23 18:14:12 2004 +0000
@@ -707,7 +707,7 @@
 {      WWT_PANEL,     7,   306,   327,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   328,   349,    14,    35, SPR_OPENTTD_BASE + 25, STR_CONVERT_RAIL_TIP},
 
-{      WWT_PANEL,     7,   350,   371,    14,    35, SPR_IMG_LANDSCAPING_S,	STR_LANDSCAPING_TOOLBAR_TIP},
+{      WWT_PANEL,     7,   350,   371,    14,    35, SPR_IMG_LANDSCAPING,	STR_LANDSCAPING_TOOLBAR_TIP},
 
 {   WIDGETS_END},
 };
--- a/road_gui.c	Thu Dec 23 17:59:37 2004 +0000
+++ b/road_gui.c	Thu Dec 23 18:14:12 2004 +0000
@@ -290,7 +290,7 @@
 {      WWT_PANEL,     7,   132,   173,    14,    35, SPR_IMG_BRIDGE,				STR_180F_BUILD_ROAD_BRIDGE},
 {      WWT_PANEL,     7,   174,   195,    14,    35, SPR_IMG_ROAD_TUNNEL,		STR_1810_BUILD_ROAD_TUNNEL},
 {      WWT_PANEL,     7,   196,   217,    14,    35, SPR_IMG_REMOVE, 				STR_1811_TOGGLE_BUILD_REMOVE_FOR},
-{      WWT_PANEL,     7,   218,   239,    14,    35, SPR_IMG_LANDSCAPING_S, STR_LANDSCAPING_TOOLBAR_TIP},
+{      WWT_PANEL,     7,   218,   239,    14,    35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 
@@ -322,7 +322,7 @@
 {     WWT_IMGBTN,     7,    66,   107,    14,    35, 0xA22,			STR_180F_BUILD_ROAD_BRIDGE},
 {     WWT_IMGBTN,     7,   108,   129,    14,    35, 0x97D,			STR_1810_BUILD_ROAD_TUNNEL},
 {     WWT_IMGBTN,     7,   130,   151,    14,    35, 0x2CA,			STR_1811_TOGGLE_BUILD_REMOVE_FOR},
-{      WWT_PANEL,     7,   152,   173,    14,    35, SPR_IMG_LANDSCAPING_S, STR_LANDSCAPING_TOOLBAR_TIP},
+{      WWT_PANEL,     7,   152,   173,    14,    35, SPR_IMG_LANDSCAPING, STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 
--- a/table/sprites.h	Thu Dec 23 17:59:37 2004 +0000
+++ b/table/sprites.h	Thu Dec 23 18:14:12 2004 +0000
@@ -724,8 +724,7 @@
 	SPR_IMG_TRUCK_BAY			= 750,
 	SPR_IMG_BRIDGE				= 2594,
 	SPR_IMG_ROAD_TUNNEL		= 2429,
-	SPR_IMG_REMOVE				= 714,
-	SPR_IMG_LANDSCAPING_S = 742
+	SPR_IMG_REMOVE				= 714
 };
 
 /* Cursor sprite numbers */