summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 23:30:48 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-15 23:30:48 +0000
commited23cac0a89a552f82225dc5c8c702850892a46d (patch)
tree4b2037ab946350d4e5b803c307b8e6f39693e1a6 /src/map/mercenary.c
parentb6b59bf78e91dbbef2c52682bef631be019964e3 (diff)
downloadhercules-ed23cac0a89a552f82225dc5c8c702850892a46d.tar.gz
hercules-ed23cac0a89a552f82225dc5c8c702850892a46d.tar.bz2
hercules-ed23cac0a89a552f82225dc5c8c702850892a46d.tar.xz
hercules-ed23cac0a89a552f82225dc5c8c702850892a46d.zip
- Applied multiple fixes which should take care of making homun save/load work on TXT now.
- Added Gatling Fever's batk bonus. - Some cleaning in status_damage which should prevent trying to free already free'd pointers when unit_remove_map invokes unit_free (when status_damage was going to invoke unit_free anyway) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8308 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 7270f9dd8..0ed0f891c 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -521,7 +521,6 @@ int merc_natural_heal(int tid,unsigned int tick,int id,int data)
return 0;
}
-#ifndef TXT_ONLY
void merc_save(struct homun_data *hd)
{
// copy data that must be saved in homunculus struct ( hp / sp )
@@ -532,12 +531,6 @@ void merc_save(struct homun_data *hd)
sd->homunculus.sp = sd->homunculus.max_sp;
intif_homunculus_requestsave(sd->status.account_id, &sd->homunculus) ;
}
-#else
-void merc_save(struct homun_data *hd)
-{
- //Not implemented...
-}
-#endif
static int merc_calc_pos(struct homun_data *hd,int tx,int ty,int dir) //[orn]
{