summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-04 04:48:30 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-04 04:48:30 +0000
commite27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb (patch)
treee5f666a82c5a0f2c5a366c40c3f05f5d1da55953 /src/map/npc.c
parent4f44cd846049aa506f3c8c43fb25d78343e71551 (diff)
downloadhercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.tar.gz
hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.tar.bz2
hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.tar.xz
hercules-e27cd1c1b31aa3cecf2006de64f2b95f90bcd7cb.zip
- Fixed missing baby-dancer job in exp2.txt
- Added function battle_set_walkdelay in charge of updating walkdelays of characters based on two criterias: when the delay is induced by damage, if the current walk delay isn't over yet, do not update it. If the delay is instead caused by a skill, then the current walk delay cannot be decreased, only increased. - Removed the canmove tick reset on skill cast cancel; likewise it isn't updated on begin casting. pc_can_move uses a skilltimer check to know whether you can move or not. - Added GrandCross's can't move delay of 900ms to skill_cast_db - Added Finger Offensive's can't move delay of 200ms/lv to skill_cast_db git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5457 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 3c3967762..a8765995e 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1472,12 +1472,8 @@ int npc_stop_walking(struct npc_data *nd,int type)
}
if(type&0x01)
clif_fixnpcpos(nd);
- if(type&0x02) {
- int delay=status_get_dmotion(&nd->bl);
- unsigned int tick = gettick();
- if(nd->canmove_tick < tick)
- nd->canmove_tick = tick + delay;
- }
+ if(type&0x02)
+ battle_set_walkdelay(&nd->bl, gettick(), status_get_dmotion(&nd->bl), 1);
return 0;
}