- 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

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);