summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorterkhen <terkhen@openttd.org>2011-01-15 16:27:04 +0000
committerterkhen <terkhen@openttd.org>2011-01-15 16:27:04 +0000
commit53c9846f14be07b887323f3203ed3a0ab52e64db (patch)
tree3422208a042702669b1837cad47455ab180aea98
parent93b26e8e3ddf39b8a775c2daa482ee52792a27e3 (diff)
downloadopenttd-53c9846f14be07b887323f3203ed3a0ab52e64db.tar.xz
(svn r21806) -Codechange: Correct additional appearances of the same typo.
-rw-r--r--changelog.txt2
-rw-r--r--src/dock_gui.cpp2
-rw-r--r--src/table/sprites.h2
-rw-r--r--src/table/station_land.h2
-rw-r--r--src/waypoint_cmd.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/changelog.txt b/changelog.txt
index c10282c4a..ec0ad91b6 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 55bbafcdc..0f2185149 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 56302f4d6..e4144141e 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 13385a4c4..aa4acec11 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 c91334051..3c065525e 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