summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-27 11:56:22 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-27 11:56:22 +0000
commitd6477ea054fa860fd44a008172f6da2e5e6a308f (patch)
tree1b82405176e3ba0677918cd554177e45bec87daf /src/map/mercenary.h
parent5c5b78dc8c26ae02a1b8245a8398c8cffdb314f3 (diff)
downloadhercules-d6477ea054fa860fd44a008172f6da2e5e6a308f.tar.gz
hercules-d6477ea054fa860fd44a008172f6da2e5e6a308f.tar.bz2
hercules-d6477ea054fa860fd44a008172f6da2e5e6a308f.tar.xz
hercules-d6477ea054fa860fd44a008172f6da2e5e6a308f.zip
* Fix homunc & code cleanup [Toms]
- Timer problems on delete_timer - Intimacy problem (overflow & new values) - Homunc deleted if intimacy < 0 - base exp is now given to master - Homunc sometimes not saved git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7913 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.h')
-rw-r--r--src/map/mercenary.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index b55cba8e1..965557759 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -76,3 +76,5 @@ int merc_natural_heal_timer_delete(struct homun_data *hd);
#define merc_stop_walking(hd, type) { if((hd)->ud.walktimer != -1) unit_stop_walking(&(hd)->bl, type); }
#define merc_stop_attack(hd) { if((hd)->ud.attacktimer != -1) unit_stop_attack(&(hd)->bl); hd->ud.target = 0; }
int read_homunculusdb(void);
+int merc_hom_increase_intimacy(struct homun_data * hd, unsigned int value);
+int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value);