From 50d7211494a6477323d3bbe9383f86edb4a31975 Mon Sep 17 00:00:00 2001 From: dominik Date: Thu, 23 Dec 2004 18:14:12 +0000 Subject: [PATCH] (svn r1254) - Fix: [ 993500 ] High bridge rendering error - Changed button to open landscaping toolbar --- airport_gui.c | 2 +- data/openttd.grf | Bin 23016 -> 23016 bytes dock_gui.c | 2 +- rail_gui.c | 2 +- road_gui.c | 4 ++-- table/sprites.h | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/airport_gui.c b/airport_gui.c index 3d06e8c4fe..235cb7494d 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 e8c15983cddc3b21f4a76f77dec83fbb08edc3e9..ff0051b124ebfb276fbab8f06a071c30c47f376c 100644 GIT binary patch delta 36 tcmaE{neoMD#tmgglV2MfPL49RoczehozZ0S8)MzcON{I`Pc{x!0{}D<4`~1Z delta 36 tcmaE{neoMD#tmggj3$%c80$_BHMX1lz{q{_Yh%O7%Z)5IPc{x!0{|=N4`l!V diff --git a/dock_gui.c b/dock_gui.c index 66e11426e5..4ab97fe3f6 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 65c5353911..5358d0add3 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 ef43bf0603..ed025b9280 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 61b4307ad6..f60ace6491 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 */