summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 23:39:12 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 23:39:12 +0000
commitb22fc5f3a8752fc93b37e7ee2a3cbeaacec3aee7 (patch)
treeb2da1a834dfc970b054f5c6d5d34940753e72777 /src/map/unit.c
parented23cac0a89a552f82225dc5c8c702850892a46d (diff)
downloadhercules-b22fc5f3a8752fc93b37e7ee2a3cbeaacec3aee7.tar.gz
hercules-b22fc5f3a8752fc93b37e7ee2a3cbeaacec3aee7.tar.bz2
hercules-b22fc5f3a8752fc93b37e7ee2a3cbeaacec3aee7.tar.xz
hercules-b22fc5f3a8752fc93b37e7ee2a3cbeaacec3aee7.zip
- Moved the deletion of timers from unit_remove_map to the homun vaporize/dead routines since unit_remove_map is also invoked whenever you warp or change maps.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8309 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 1b7b67c11..b70c88a97 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1595,8 +1595,6 @@ int unit_remove_map(struct block_list *bl, int clrtype) {
} else if (bl->type == BL_HOM) {
struct homun_data *hd = (struct homun_data *) bl;
struct map_session_data *sd = hd->master;
- merc_hom_hungry_timer_delete(hd);
- merc_natural_heal_timer_delete(hd);
if(!sd || !sd->homunculus.intimacy)
{ //He's going to be deleted.
clif_emotion(bl, 28) ; //sob