From 3798baf5945874481cfdacbcd141feab07f3b9ed Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 17 Jan 2008 09:46:31 +0000 Subject: - Made battle_check_range fail whenever the distance between src/target is greater than the viewing range. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12084 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index e0d21f4ec..7912e71c8 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3269,6 +3269,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f *------------------------------------------*/ bool battle_check_range(struct block_list *src,struct block_list *bl,int range) { + int d; nullpo_retr(false, src); nullpo_retr(false, bl); @@ -3281,9 +3282,12 @@ bool battle_check_range(struct block_list *src,struct block_list *bl,int range) if (!check_distance_bl(src, bl, range)) return false; - if(distance_bl(src, bl) < 2) //No need for path checking. + if((d=distance_bl(src, bl)) < 2) //No need for path checking. return true; + if (d> AREA_SIZE) + return false; //Avoid targetting objects beyond your range of sight. + // ?áŠQ•¨”»’è return path_search_long(NULL,src->m,src->x,src->y,bl->x,bl->y,CELL_CHKWALL); } -- cgit v1.2.3-60-g2f50