summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-01 22:19:18 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-01 22:19:18 +0000
commitc9181667d0cea7e6cfe99745d18c760c4a797912 (patch)
tree78f32c3f99a5e11ff7ee4b3af70035f0e5235e6b /src/map/npc.c
parentde683beed6af67c57efd4b762a9797f98d4e28c6 (diff)
downloadhercules-c9181667d0cea7e6cfe99745d18c760c4a797912.tar.gz
hercules-c9181667d0cea7e6cfe99745d18c760c4a797912.tar.bz2
hercules-c9181667d0cea7e6cfe99745d18c760c4a797912.tar.xz
hercules-c9181667d0cea7e6cfe99745d18c760c4a797912.zip
- More code for mercenaries and starting work on restrictions.
* Heal and Sanctuary skills have their effectiveness on mercenaries reduced by 50%. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13183 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index cc87aa611..592bd88f1 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2946,7 +2946,7 @@ int do_final_npc(void)
if ((bl = map_id2bl(i))){
if (bl->type == BL_NPC)
npc_unload((struct npc_data *)bl);
- else if (bl->type&(BL_MOB|BL_PET|BL_HOM))
+ else if (bl->type&(BL_MOB|BL_PET|BL_HOM|BL_MER))
unit_free(bl, 0);
}
}