diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-07-31 01:50:57 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-07-31 01:50:57 +0000 |
| commit | 9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba (patch) | |
| tree | 11806685224fc447d19fc10d70c6804d1eb4a853 /src/map/npc.c | |
| parent | 8c57f9decf3895c9081aa70bafd3ee949273030f (diff) | |
| download | hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.tar.gz hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.tar.bz2 hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.tar.xz hercules-9d4765e65ce8dd0eccd1cdd4dbaa346f5a9cd6ba.zip | |
* Implemented three new mercenary skills.
* Added two new monster mercenaries.
- Added information for the three new mercenary skills.
- Added mercenary skills with cast times to castnodex.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14367 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
| -rw-r--r-- | src/map/npc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index aa9bfd228..fe3318c9b 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -149,6 +149,9 @@ int npc_enable_sub(struct block_list *bl, va_list ap) if( npc_ontouch_event(sd,nd) > 0 && npc_ontouch2_event(sd,nd) > 0 ) { // failed to run OnTouch event, so just click the npc + if (sd->npc_id != 0) + return 0; + pc_stop_walking(sd,1); npc_click(sd,nd); } |