summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominik <dominik@openttd.org>2004-12-23 18:14:12 +0000
committerdominik <dominik@openttd.org>2004-12-23 18:14:12 +0000
commit60052ffb453637fb581671e8ded534eed7420a9b (patch)
treea3988f5c912a9c2b4b039aadd802106500729506
parent1558948b9b622db959166f5ca3d29df1ddd6f116 (diff)
downloadopenttd-60052ffb453637fb581671e8ded534eed7420a9b.tar.xz
(svn r1254) - Fix: [ 993500 ] High bridge rendering error
- Changed button to open landscaping toolbar
-rw-r--r--airport_gui.c2
-rw-r--r--data/openttd.grfbin23016 -> 23016 bytes
-rw-r--r--dock_gui.c2
-rw-r--r--rail_gui.c2
-rw-r--r--road_gui.c4
-rw-r--r--table/sprites.h3
6 files changed, 6 insertions, 7 deletions
diff --git a/airport_gui.c b/airport_gui.c
index 3d06e8c4f..235cb7494 100644
--- a/airport_gui.c
+++ b/airport_gui.c
@@ -101,7 +101,7 @@ static const Widget _air_toolbar_widgets[] = {
{ 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},
};
diff --git a/data/openttd.grf b/data/openttd.grf
index e8c15983c..ff0051b12 100644
--- a/data/openttd.grf
+++ b/data/openttd.grf
Binary files differ
diff --git a/dock_gui.c b/dock_gui.c
index 66e11426e..4ab97fe3f 100644
--- a/dock_gui.c
+++ b/dock_gui.c
@@ -176,7 +176,7 @@ static const Widget _build_docks_toolb_widgets[] = {
{ 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},
};
diff --git a/rail_gui.c b/rail_gui.c
index 65c535391..5358d0add 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -707,7 +707,7 @@ static const Widget _build_railroad_widgets[] = {
{ 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},
};
diff --git a/road_gui.c b/road_gui.c
index ef43bf060..ed025b928 100644
--- a/road_gui.c
+++ b/road_gui.c
@@ -290,7 +290,7 @@ static const Widget _build_road_widgets[] = {
{ 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 @@ static const Widget _build_road_scen_widgets[] = {
{ 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},
};
diff --git a/table/sprites.h b/table/sprites.h
index 61b4307ad..f60ace649 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -724,8 +724,7 @@ enum Sprites {
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 */