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

1 files changed, 26 insertions, 26 deletions

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