diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-26 04:54:22 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-26 04:54:22 +0000 |
| commit | 317ba93ee42b32c369f7aa7f669f4acb3ac72e60 (patch) | |
| tree | f032cb881d1d50ef026b155b8c9d4e47a0b7f081 /src/map/npc.c | |
| parent | 3f38fcaeaf61cf293c5392a67d85cfd5465d9585 (diff) | |
| download | hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.tar.gz hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.tar.bz2 hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.tar.xz hercules-317ba93ee42b32c369f7aa7f669f4acb3ac72e60.zip | |
* Added status.c and status.h of jA 1091 update and moved some functions into the new source files
* Updated auto_counter_type's description in battle_athena
* Removed some unnecessary skill level checks in battle.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@996 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 349514e3b..133ab0ed7 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -15,6 +15,7 @@ #include "clif.h" #include "intif.h" #include "pc.h" +#include "status.h" #include "itemdb.h" #include "script.h" #include "mob.h" @@ -1117,8 +1118,8 @@ static int calc_next_walk_step(struct npc_data *nd) if(nd->walkpath.path_pos>=nd->walkpath.path_len) return -1; if(nd->walkpath.path[nd->walkpath.path_pos]&1) - return battle_get_speed(&nd->bl)*14/10; - return battle_get_speed(&nd->bl); + return status_get_speed(&nd->bl)*14/10; + return status_get_speed(&nd->bl); } @@ -1327,7 +1328,7 @@ int npc_stop_walking(struct npc_data *nd,int type) if(type&0x01) clif_fixnpcpos(nd); if(type&0x02) { - int delay=battle_get_dmotion(&nd->bl); + int delay=status_get_dmotion(&nd->bl); unsigned int tick = gettick(); if(nd->canmove_tick < tick) nd->canmove_tick = tick + delay; |