(svn r19715) -Codechange: Rename all appareances of shiplift to lock.

2 files changed, 54 insertions, 54 deletions

diff --git a/src/table/sprites.h b/src/table/sprites.h
index 3fc4f2f22..fb4274439 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -570,38 +570,38 @@ static const SpriteID SPR_WATER_SLOPE_Y_UP        = SPR_CANALS_BASE + 0; // Wate
 static const SpriteID SPR_WATER_SLOPE_X_DOWN      = SPR_CANALS_BASE + 1; // positive X
 static const SpriteID SPR_WATER_SLOPE_X_UP        = SPR_CANALS_BASE + 2; // negative X
 static const SpriteID SPR_WATER_SLOPE_Y_DOWN      = SPR_CANALS_BASE + 3; // positive Y
-/* sprites for the shiplifts
- * there are 4 kinds of shiplifts, each of them is 3 tiles long.
+/* sprites for the locks
+ * there are 4 kinds of locks, each of them is 3 tiles long.
  * the four kinds are running in the X and Y direction and
  * are "lowering" either in the "+" or the "-" direction.
  * the three tiles are the center tile (where the slope is)
  * and a bottom and a top tile */
-static const SpriteID SPR_SHIPLIFT_BASE                 = SPR_CANALS_BASE +  4;
-static const SpriteID SPR_SHIPLIFT_Y_UP_CENTER_REAR     = SPR_CANALS_BASE +  4;
-static const SpriteID SPR_SHIPLIFT_X_DOWN_CENTER_REAR   = SPR_CANALS_BASE +  5;
-static const SpriteID SPR_SHIPLIFT_X_UP_CENTER_REAR     = SPR_CANALS_BASE +  6;
-static const SpriteID SPR_SHIPLIFT_Y_DOWN_CENTER_REAR   = SPR_CANALS_BASE +  7;
-static const SpriteID SPR_SHIPLIFT_Y_UP_CENTER_FRONT    = SPR_CANALS_BASE +  8;
-static const SpriteID SPR_SHIPLIFT_X_DOWN_CENTER_FRONT  = SPR_CANALS_BASE +  9;
-static const SpriteID SPR_SHIPLIFT_X_UP_CENTER_FRONT    = SPR_CANALS_BASE + 10;
-static const SpriteID SPR_SHIPLIFT_Y_DOWN_CENTER_FRONT  = SPR_CANALS_BASE + 11;
-static const SpriteID SPR_SHIPLIFT_Y_UP_BOTTOM_REAR     = SPR_CANALS_BASE + 12;
-static const SpriteID SPR_SHIPLIFT_X_DOWN_BOTTOM_REAR   = SPR_CANALS_BASE + 13;
-static const SpriteID SPR_SHIPLIFT_X_UP_BOTTOM_REAR     = SPR_CANALS_BASE + 14;
-static const SpriteID SPR_SHIPLIFT_Y_DOWN_BOTTOM_REAR   = SPR_CANALS_BASE + 15;
-static const SpriteID SPR_SHIPLIFT_Y_UP_BOTTOM_FRONT    = SPR_CANALS_BASE + 16;
-static const SpriteID SPR_SHIPLIFT_X_DOWN_BOTTOM_FRONT  = SPR_CANALS_BASE + 17;
-static const SpriteID SPR_SHIPLIFT_X_UP_BOTTOM_FRONT    = SPR_CANALS_BASE + 18;
-static const SpriteID SPR_SHIPLIFT_Y_DOWN_BOTTOM_FRONT  = SPR_CANALS_BASE + 19;
-static const SpriteID SPR_SHIPLIFT_Y_UP_TOP_REAR        = SPR_CANALS_BASE + 20;
-static const SpriteID SPR_SHIPLIFT_X_DOWN_TOP_REAR      = SPR_CANALS_BASE + 21;
-static const SpriteID SPR_SHIPLIFT_X_UP_TOP_REAR        = SPR_CANALS_BASE + 22;
-static const SpriteID SPR_SHIPLIFT_Y_DOWN_TOP_REAR      = SPR_CANALS_BASE + 23;
-static const SpriteID SPR_SHIPLIFT_Y_UP_TOP_FRONT       = SPR_CANALS_BASE + 24;
-static const SpriteID SPR_SHIPLIFT_X_DOWN_TOP_FRONT     = SPR_CANALS_BASE + 25;
-static const SpriteID SPR_SHIPLIFT_X_UP_TOP_FRONT       = SPR_CANALS_BASE + 26;
-static const SpriteID SPR_SHIPLIFT_Y_DOWN_TOP_FRONT     = SPR_CANALS_BASE + 27;
-static const SpriteID SPR_CANAL_DIKES_BASE              = SPR_CANALS_BASE + 52;
+static const SpriteID SPR_LOCK_BASE                 = SPR_CANALS_BASE +  4;
+static const SpriteID SPR_LOCK_Y_UP_CENTER_REAR     = SPR_CANALS_BASE +  4;
+static const SpriteID SPR_LOCK_X_DOWN_CENTER_REAR   = SPR_CANALS_BASE +  5;
+static const SpriteID SPR_LOCK_X_UP_CENTER_REAR     = SPR_CANALS_BASE +  6;
+static const SpriteID SPR_LOCK_Y_DOWN_CENTER_REAR   = SPR_CANALS_BASE +  7;
+static const SpriteID SPR_LOCK_Y_UP_CENTER_FRONT    = SPR_CANALS_BASE +  8;
+static const SpriteID SPR_LOCK_X_DOWN_CENTER_FRONT  = SPR_CANALS_BASE +  9;
+static const SpriteID SPR_LOCK_X_UP_CENTER_FRONT    = SPR_CANALS_BASE + 10;
+static const SpriteID SPR_LOCK_Y_DOWN_CENTER_FRONT  = SPR_CANALS_BASE + 11;
+static const SpriteID SPR_LOCK_Y_UP_BOTTOM_REAR     = SPR_CANALS_BASE + 12;
+static const SpriteID SPR_LOCK_X_DOWN_BOTTOM_REAR   = SPR_CANALS_BASE + 13;
+static const SpriteID SPR_LOCK_X_UP_BOTTOM_REAR     = SPR_CANALS_BASE + 14;
+static const SpriteID SPR_LOCK_Y_DOWN_BOTTOM_REAR   = SPR_CANALS_BASE + 15;
+static const SpriteID SPR_LOCK_Y_UP_BOTTOM_FRONT    = SPR_CANALS_BASE + 16;
+static const SpriteID SPR_LOCK_X_DOWN_BOTTOM_FRONT  = SPR_CANALS_BASE + 17;
+static const SpriteID SPR_LOCK_X_UP_BOTTOM_FRONT    = SPR_CANALS_BASE + 18;
+static const SpriteID SPR_LOCK_Y_DOWN_BOTTOM_FRONT  = SPR_CANALS_BASE + 19;
+static const SpriteID SPR_LOCK_Y_UP_TOP_REAR        = SPR_CANALS_BASE + 20;
+static const SpriteID SPR_LOCK_X_DOWN_TOP_REAR      = SPR_CANALS_BASE + 21;
+static const SpriteID SPR_LOCK_X_UP_TOP_REAR        = SPR_CANALS_BASE + 22;
+static const SpriteID SPR_LOCK_Y_DOWN_TOP_REAR      = SPR_CANALS_BASE + 23;
+static const SpriteID SPR_LOCK_Y_UP_TOP_FRONT       = SPR_CANALS_BASE + 24;
+static const SpriteID SPR_LOCK_X_DOWN_TOP_FRONT     = SPR_CANALS_BASE + 25;
+static const SpriteID SPR_LOCK_X_UP_TOP_FRONT       = SPR_CANALS_BASE + 26;
+static const SpriteID SPR_LOCK_Y_DOWN_TOP_FRONT     = SPR_CANALS_BASE + 27;
+static const SpriteID SPR_CANAL_DIKES_BASE          = SPR_CANALS_BASE + 52;
 
 /* Sprites for tunnels and bridges */
 static const SpriteID SPR_TUNNEL_ENTRY_REAR_RAIL   = 2365;
diff --git a/src/table/water_land.h b/src/table/water_land.h
index e2d881e9f..97cee2e3e 100644
--- a/src/table/water_land.h
+++ b/src/table/water_land.h
@@ -7,7 +7,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file water_land.h Sprites to use and how to display them for water tiles (depots/shiplifts). */
+/** @file water_land.h Sprites to use and how to display them for water tiles (depots/locks). */
 
 struct WaterDrawTileStruct {
 	byte delta_x;
@@ -55,105 +55,105 @@ static const WaterDrawTileStruct * const _shipdepot_display_seq[] = {
 	_shipdepot_display_seq_4,
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_0[] = {
+static const WaterDrawTileStruct _lock_display_seq_0[] = {
 	BEGIN(1),
 	{ 0,   0, 0, 0x10, 1, 0x14, 0 + 1 },
 	{ 0, 0xF, 0, 0x10, 1, 0x14, 4 + 1 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_1[] = {
+static const WaterDrawTileStruct _lock_display_seq_1[] = {
 	BEGIN(0),
 	{   0, 0, 0, 1, 0x10, 0x14, 0 },
 	{ 0xF, 0, 0, 1, 0x10, 0x14, 4 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_2[] = {
+static const WaterDrawTileStruct _lock_display_seq_2[] = {
 	BEGIN(2),
 	{ 0,   0, 0, 0x10, 1, 0x14, 0 + 2 },
 	{ 0, 0xF, 0, 0x10, 1, 0x14, 4 + 2 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_3[] = {
+static const WaterDrawTileStruct _lock_display_seq_3[] = {
 	BEGIN(3),
 	{   0, 0, 0, 1, 0x10, 0x14, 0 + 3 },
 	{ 0xF, 0, 0, 1, 0x10, 0x14, 4 + 3 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_0b[] = {
+static const WaterDrawTileStruct _lock_display_seq_0b[] = {
 	BEGIN(0xFDD),
 	{ 0,   0, 0, 0x10, 1, 0x14, 8 + 1 },
 	{ 0, 0xF, 0, 0x10, 1, 0x14, 12 + 1 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_1b[] = {
+static const WaterDrawTileStruct _lock_display_seq_1b[] = {
 	BEGIN(0xFDD),
 	{   0, 0, 0, 0x1, 0x10, 0x14, 8 },
 	{ 0xF, 0, 0, 0x1, 0x10, 0x14, 12 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_2b[] = {
+static const WaterDrawTileStruct _lock_display_seq_2b[] = {
 	BEGIN(0xFDD),
 	{ 0,   0, 0, 0x10, 1, 0x14, 8 + 2 },
 	{ 0, 0xF, 0, 0x10, 1, 0x14, 12 + 2 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_3b[] = {
+static const WaterDrawTileStruct _lock_display_seq_3b[] = {
 	BEGIN(0xFDD),
 	{   0, 0, 0, 1, 0x10, 0x14, 8 + 3 },
 	{ 0xF, 0, 0, 1, 0x10, 0x14, 12 + 3 },
 	END(0)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_0t[] = {
+static const WaterDrawTileStruct _lock_display_seq_0t[] = {
 	BEGIN(0xFDD),
 	{ 0,   0, 0, 0x10, 1, 0x14, 16 + 1 },
 	{ 0, 0xF, 0, 0x10, 1, 0x14, 20 + 1 },
 	END(8)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_1t[] = {
+static const WaterDrawTileStruct _lock_display_seq_1t[] = {
 	BEGIN(0xFDD),
 	{   0, 0, 0, 0x1, 0x10, 0x14, 16 },
 	{ 0xF, 0, 0, 0x1, 0x10, 0x14, 20 },
 	END(8)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_2t[] = {
+static const WaterDrawTileStruct _lock_display_seq_2t[] = {
 	BEGIN(0xFDD),
 	{ 0,   0, 0, 0x10, 1, 0x14, 16 + 2 },
 	{ 0, 0xF, 0, 0x10, 1, 0x14, 20 + 2 },
 	END(8)
 };
 
-static const WaterDrawTileStruct _shiplift_display_seq_3t[] = {
+static const WaterDrawTileStruct _lock_display_seq_3t[] = {
 	BEGIN(0xFDD),
 	{   0, 0, 0, 1, 0x10, 0x14, 16 + 3 },
 	{ 0xF, 0, 0, 1, 0x10, 0x14, 20 + 3 },
 	END(8)
 };
 
-static const WaterDrawTileStruct * const _shiplift_display_seq[] = {
-	_shiplift_display_seq_0,
-	_shiplift_display_seq_1,
-	_shiplift_display_seq_2,
-	_shiplift_display_seq_3,
+static const WaterDrawTileStruct * const _lock_display_seq[] = {
+	_lock_display_seq_0,
+	_lock_display_seq_1,
+	_lock_display_seq_2,
+	_lock_display_seq_3,
 
-	_shiplift_display_seq_0b,
-	_shiplift_display_seq_1b,
-	_shiplift_display_seq_2b,
-	_shiplift_display_seq_3b,
+	_lock_display_seq_0b,
+	_lock_display_seq_1b,
+	_lock_display_seq_2b,
+	_lock_display_seq_3b,
 
-	_shiplift_display_seq_0t,
-	_shiplift_display_seq_1t,
-	_shiplift_display_seq_2t,
-	_shiplift_display_seq_3t,
+	_lock_display_seq_0t,
+	_lock_display_seq_1t,
+	_lock_display_seq_2t,
+	_lock_display_seq_3t,
 };
 
 #undef BEGIN