From 53c9846f14be07b887323f3203ed3a0ab52e64db Mon Sep 17 00:00:00 2001 From: terkhen Date: Sat, 15 Jan 2011 16:27:04 +0000 Subject: [PATCH] (svn r21806) -Codechange: Correct additional appearances of the same typo. --- changelog.txt | 2 +- src/dock_gui.cpp | 2 +- src/table/sprites.h | 2 +- src/table/station_land.h | 2 +- src/waypoint_cmd.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index c10282c4a8..ec0ad91b62 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2346,7 +2346,7 @@ - Fix: Several desync fixes (incorrect roadstop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157) - Fix: Some disaster-events fixed: combat chopper shoots from right position, submarine once again moves around (r8140, r8158) - Fix: 'out of sprite memory' warning messages due to incorrect assumption of requested memory for sprites (r8133) -- Fix: Bouys are now built and numbered 1..9 not 9..1 [FS#538] (r8123) +- Fix: Buoys are now built and numbered 1..9 not 9..1 [FS#538] (r8123) - Fix: Clicking for more news properly cycles through the news history backwards, and does not show the first item doubly if it's already open (r8049) - Fix: Crash when removing a town in the scenario editor while the query window is open for one of the town's tiles (r8030) - Fix: Overflow of system-ticks was not handled properly, resulting in a possibly unresponsive server/client (r8028) diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index 55bbafcdc5..0f2185149e 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -318,7 +318,7 @@ static const NWidgetPart _nested_build_docks_toolbar_widgets[] = { NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_DEMOLISH), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC), NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_DEPOT), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_SHIP_DEPOT, STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP), NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_STATION), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_SHIP_DOCK, STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_BUOY), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BOUY, STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_BUOY), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BUOY, STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP), NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_BUILD_AQUEDUCT), SetMinimalSize(23, 22), SetFill(0, 1), SetDataTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP), EndContainer(), }; diff --git a/src/table/sprites.h b/src/table/sprites.h index 56302f4d60..e4144141ec 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -1249,7 +1249,7 @@ static const SpriteID SPR_IMG_AIRPORT = 744; /* dock_gui.c */ static const SpriteID SPR_IMG_SHIP_DEPOT = 748; static const SpriteID SPR_IMG_SHIP_DOCK = 746; -static const SpriteID SPR_IMG_BOUY = 693; +static const SpriteID SPR_IMG_BUOY = 693; static const SpriteID SPR_IMG_AQUEDUCT = SPR_OPENTTD_BASE + 145; /* music_gui.c */ diff --git a/src/table/station_land.h b/src/table/station_land.h index 13385a4c4b..aa4acec119 100644 --- a/src/table/station_land.h +++ b/src/table/station_land.h @@ -395,7 +395,7 @@ static const DrawTileSeqStruct _station_display_datas_81[] = { /* Buoy, which will _always_ drown under the ship */ static const DrawTileSeqStruct _station_display_datas_82[] = { - TILE_SEQ_LINE( 4, -1, 0, 0, 0, 0, SPR_IMG_BOUY) + TILE_SEQ_LINE( 4, -1, 0, 0, 0, 0, SPR_IMG_BUOY) TILE_SEQ_END() }; diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp index c913340517..3c065525e9 100644 --- a/src/waypoint_cmd.cpp +++ b/src/waypoint_cmd.cpp @@ -273,7 +273,7 @@ CommandCost CmdBuildRailWaypoint(TileIndex start_tile, DoCommandFlag flags, uint /** * Build a buoy. - * @param tile tile where to place the bouy + * @param tile tile where to place the buoy * @param flags operation to perform * @param p1 unused * @param p2 unused