summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 14:19:55 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-02 14:19:55 +0000
commit0a40ae70878e56aa44ee7b2773f9cd6cf21981fb (patch)
tree9be181b20c263cc1bdf5073307c361571e065854 /src/map/mercenary.c
parent37cc17c1b9a2dd29e1623a46cfc332e1aeb76751 (diff)
downloadhercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.tar.gz
hercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.tar.bz2
hercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.tar.xz
hercules-0a40ae70878e56aa44ee7b2773f9cd6cf21981fb.zip
- Corrected the login TXT server not initializing the waiting_disconnect variable.
- Corrected the attack_attr_none check being backwards. - All pets can now move regardless of their Mob counter part setting. - Added hom_setting&0x40, when set it clears the "can't reuse" skill delay when you vaporize a homunculus (set by default). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10120 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 80e471ddc..c21a8721d 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -103,6 +103,8 @@ int merc_hom_vaporize(struct map_session_data *sd, int flag)
//Delete timers when vaporized.
merc_hom_hungry_timer_delete(hd);
hd->homunculus.vaporize = 1;
+ if(battle_config.hom_setting&0x40)
+ memset(hd->blockskill, 0, sizeof(hd->blockskill));
clif_hominfo(sd, sd->hd, 0);
merc_save(hd);
return unit_remove_map(&hd->bl, 0);