From c05e368aead0afeb1fb477b6f1566a297dcdc957 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 3 May 2012 00:38:48 +0000 Subject: Fixed bugreport:3452 players' circular target range is now matching official servers. credits goes all to Angezerus for his formula and fix. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16054 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/battle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/map/battle.c') diff --git a/src/map/battle.c b/src/map/battle.c index ce75e0446..113d82fbf 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4859,13 +4859,11 @@ bool battle_check_range(struct block_list *src, struct block_list *bl, int range return false; #ifndef CIRCULAR_AREA - if( src->type == BL_PC ) - { // Range for players' attacks and skills should always have a circular check. [Inkfish] + if( src->type == BL_PC ) { // Range for players' attacks and skills should always have a circular check. [Angezerus] int dx = src->x - bl->x, dy = src->y - bl->y; - if( !check_distance(dx*dx + dy*dy, 0, range*range+(dx&&dy?1:0)) ) + if( !check_distance(dx, dy, range) ) return false; - } - else + } else #endif if( !check_distance_bl(src, bl, range) ) return false; -- cgit v1.2.3-70-g09d2