From c2ca8110f6a3cab0171d32920b7a724d0c180068 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 21 Nov 2007 13:29:45 +0000 Subject: - Moved subtype from struct block_list to struct npc_data. - Fixed some compilation warnings. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11772 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 2834f768e..0a9c4aab5 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -608,7 +608,6 @@ int merc_hom_alloc(struct map_session_data *sd, struct s_homunculus *hom) return 1; } sd->hd = hd = aCalloc(1,sizeof(struct homun_data)); - hd->bl.subtype = MONS; hd->bl.type = BL_HOM; hd->bl.id = npc_get_new_npc_id(); @@ -643,7 +642,6 @@ void merc_hom_init_timers(struct homun_data * hd) { if (hd->hungry_timer == -1) hd->hungry_timer = add_timer(gettick()+hd->homunculusDB->hungryDelay,merc_hom_hungry,hd->master->bl.id,0); - hd->ud.canact_tick = 0; //Reset can-act delay hd->regen.state.block = 0; //Restore HP/SP block. } -- cgit v1.2.3-70-g09d2