summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-31 20:19:56 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-31 20:19:56 +0000
commit250a8f539f87eb04e2321b6a0a6cd5850f38ac65 (patch)
treec8daac1a7392ce7a41dbb3e196c69b6ff38081d9 /src/map/skill.c
parent5af84391c50d5625c870d567e298b0628ba2a4ef (diff)
downloadhercules-250a8f539f87eb04e2321b6a0a6cd5850f38ac65.tar.gz
hercules-250a8f539f87eb04e2321b6a0a6cd5850f38ac65.tar.bz2
hercules-250a8f539f87eb04e2321b6a0a6cd5850f38ac65.tar.xz
hercules-250a8f539f87eb04e2321b6a0a6cd5850f38ac65.zip
Merged mpeg's fix on ninja skills
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8012 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index f8d880556..d64997c71 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2734,7 +2734,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
BF_WEAPON, src, src, skillid, skilllv, tick, flag, BCT_ENEMY);
break;
- case NJ_SHADOWJUMP: //[blackhole89]
case TK_JUMPKICK:
if (skillid == TK_JUMPKICK)
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
@@ -2766,7 +2765,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
skill_attack(BF_WEAPON, src, src, bl, skillid, skilllv, tick, flag);
dir = dir < 4 ? dir+4 : dir-4; // change direction [Celest]
unit_setdir(bl,dir);
- clif_changed_dir(bl);
+ //clif_changed_dir(bl); Already done by unit_setdir
}
else if (sd)
clif_skill_fail(sd,skillid,0,0);
@@ -6143,6 +6142,16 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
if (sd) skill_blockpc_start (sd, MO_EXTREMITYFIST, 2000);
}
break;
+ case NJ_SHADOWJUMP:
+ {
+ unit_movepos(src, x, y, 1, 0);
+ unit_setdir(src, (unit_getdir(src) + 4)%8);
+ clif_slide(src,x,y);
+
+ if (sc && sc->data[SC_HIDING].timer != -1)
+ status_change_end(src, SC_HIDING, -1);
+ }
+ break;
case AM_SPHEREMINE:
case AM_CANNIBALIZE:
if(sd) {