From 77e8294908fcbf69431d87b74a8ed15d3ab5fd2e Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 16 Aug 2006 14:12:01 +0000 Subject: - Now arrow-consuming skills where your main weapon is a whip or musical instrument WILL count as arrow-type attacks, using the atk of the arrow and all related bonuses. - Fixed some homun timer initialization code. - Some cleanups on the pet.c code, but no idea if pet view will work correctly now. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8315 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index f63a75766..e76e1bcac 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -778,14 +778,6 @@ int merc_hom_create(struct map_session_data *sd) hd->bl.prev=NULL; hd->bl.next=NULL; hd->exp_next=hexptbl[hd->master->homunculus.level - 1]; - hd->ud.attacktimer=-1; - hd->ud.attackabletime=gettick(); - hd->target_id = 0 ; - - for(i=0;isc.data[i].timer=-1; - hd->sc.data[i].val1 = hd->sc.data[i].val2 = hd->sc.data[i].val3 = hd->sc.data[i].val4 = 0; - } hd->base_status.hp = hd->master->homunculus.hp ; hd->base_status.max_hp = hd->master->homunculus.max_hp ; @@ -802,13 +794,14 @@ int merc_hom_create(struct map_session_data *sd) status_set_viewdata(&hd->bl, hd->master->homunculus.class_); status_change_init(&hd->bl); - hd->ud.dir = sd->ud.dir; unit_dataset(&hd->bl); + hd->ud.dir = sd->ud.dir; map_addiddb(&hd->bl); status_calc_homunculus(hd,1); // Timers + hd->hungry_timer = hd->natural_heal_timer = -1; merc_hom_init_timers(hd); return 0; } -- cgit v1.2.3-60-g2f50