summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-14 19:48:16 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-14 19:48:16 +0000
commit5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100 (patch)
treec12c5c2af8d5344166acfff7b2e7926f0c959362 /src/map/mercenary.h
parentb1ef0da5a7fdd3d48f758c3e8ec621a2d52650ab (diff)
downloadhercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.gz
hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.bz2
hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.tar.xz
hercules-5a6f4e191743aca6fe6f4bbb3e371df4fe9a7100.zip
- Sacrifice no longer shows damage to self.
- When Asura fails, the skill display will still come off. - Cleaned up AM_CALLHOMUN so that the required item is specified on skill_require_db - Cleaned up function merc_call_homun and added function merc_hom_vaporize to handle the respective cases. - Cleaned up a bit unit_remove_map/unit_free on regards to homun. it will display the /sob emotion when the homun dies due to low intimacy. Moved removal of timers and all that to unit_free - Cleaned up function merc_hom_dead - Simplified lots of code around by using the new merc functions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8279 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index aa07538ff..851abd4ee 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -62,7 +62,7 @@ int merc_hom_gainexp(struct homun_data *hd,int exp) ;
int merc_hom_levelup(struct homun_data *hd) ;
int merc_hom_evolution(struct homun_data *hd) ;
void merc_hom_heal(struct homun_data *hd,int hp,int sp);
-int merc_hom_delete(struct homun_data *hd, int flag) ;
+int merc_hom_vaporize(struct map_session_data *sd, int flag);
int merc_hom_revive(struct map_session_data *sd, int per);
void merc_save(struct homun_data *hd);
int merc_call_homunculus(struct map_session_data *sd);