summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-22 13:53:49 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-22 13:53:49 +0000
commit825b015a7f9e2179e593f417658ec36e484e1e6d (patch)
treee1a976682905b65d07c9444d6c66caef6ee54d0c /src/map
parentb2acf4c0b0eaeb9415bc5d82fb2df8253b599325 (diff)
downloadhercules-825b015a7f9e2179e593f417658ec36e484e1e6d.tar.gz
hercules-825b015a7f9e2179e593f417658ec36e484e1e6d.tar.bz2
hercules-825b015a7f9e2179e593f417658ec36e484e1e6d.tar.xz
hercules-825b015a7f9e2179e593f417658ec36e484e1e6d.zip
- Fixed the homunc hungry timer being started when the homun data is received from the char-server and the homunc is NOT 'active'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9292 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/mercenary.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 34c7d9cd9..2beccb554 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -564,9 +564,7 @@ int merc_hom_alloc(struct map_session_data *sd, struct s_homunculus *hom)
map_addiddb(&hd->bl);
status_calc_homunculus(hd,1);
- // Timers
hd->hungry_timer = -1;
- merc_hom_init_timers(hd);
return 0;
}
@@ -652,6 +650,7 @@ int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag)
clif_homskillinfoblock(sd);
clif_hominfo(sd,hd,0);
clif_send_homdata(sd,SP_ACK,0);
+ merc_hom_init_timers(hd);
}
return 1;
}