From 18af2a807ce340ae0cbbc7e2e48ecce25ed010df Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Sun, 8 Jul 2012 16:19:43 +0000 Subject: [PATCH] Use the wrapper move_to() function, remove unused function. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18354 282e977c-c81d-0410-88c4-b93c2d0d6712 --- python/CFMove.py | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/python/CFMove.py b/python/CFMove.py index be98d63b9..2b0213054 100644 --- a/python/CFMove.py +++ b/python/CFMove.py @@ -21,34 +21,6 @@ dir_x = [ 0, 0, 1, 1, 1, 0, -1, -1, -1 ] dir_y = [ 0, -1, -1, 0, 1, 1, 1, 0, -1 ] -def coordinates_to_dir(x, y): - '''This returns, for the specified offsets, the direction to move to get there.''' - q = 0 - if(y == 0): - q = -300 * x; - else: - q = int(x * 100 / y); - if(y>0): - if(q < -242): - return 3 - if (q < -41): - return 2 - if (q < 41): - return 1 - if (q < 242): - return 8 ; - return 7 - - if (q < -242): - return 7 - if (q < -41): - return 6 - if (q < 41): - return 5 - if (q < 242): - return 4 - return 3 - def get_object_to(obj, x, y): '''This tries to move obj to the (x, y) location. Return value is: @@ -56,7 +28,5 @@ def get_object_to(obj, x, y): * 1: object moved towards the goal * 2: object's movement was blocked. ''' - if obj.X == x and obj.Y == y: - return 0 # Move returns 0 for couldn't move, 1 for moved. - return 2 - obj.Move(coordinates_to_dir(obj.X - x, obj.Y - y)) + return obj.MoveTo(x, y)