summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-19 16:00:02 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-01-19 16:00:02 +0000
commit94a01c593251ccefa4b8b360de51bca5631cab59 (patch)
tree2ddec04f469fe9bca989362ef855bda599e5c86a /src
parente300536e2257c55c1a1baf4e041b022adb862790 (diff)
downloadhercules-94a01c593251ccefa4b8b360de51bca5631cab59.tar.gz
hercules-94a01c593251ccefa4b8b360de51bca5631cab59.tar.bz2
hercules-94a01c593251ccefa4b8b360de51bca5631cab59.tar.xz
hercules-94a01c593251ccefa4b8b360de51bca5631cab59.zip
Intimidate now checks the distance between source and target in case it kills the target and then warps the respawned one.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14221 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 8fadb870e..7dc71da7d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2313,7 +2313,7 @@ static int skill_timerskill(int tid, unsigned int tick, int id, intptr data)
break;
if(skl->target_id) {
target = map_id2bl(skl->target_id);
- if( skl->skill_id == RG_INTIMIDATE && (!target || target->prev == NULL) )
+ if( skl->skill_id == RG_INTIMIDATE && (!target || target->prev == NULL || !check_distance_bl(src,target,AREA_SIZE)) )
target = src; //Required since it has to warp.
if(target == NULL)
break;