diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-21 13:29:45 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-21 13:29:45 +0000 |
| commit | c2ca8110f6a3cab0171d32920b7a724d0c180068 (patch) | |
| tree | cce3f3a36fd692a9c7d87963ef4b14dd9c57103b /src/map/mercenary.c | |
| parent | edaa6dcc93fd64bd961fcbc701e7ce16bf31a350 (diff) | |
| download | hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.gz hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.bz2 hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.tar.xz hercules-c2ca8110f6a3cab0171d32920b7a724d0c180068.zip | |
- 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
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 2 |
1 files changed, 0 insertions, 2 deletions
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. } |