From ed23cac0a89a552f82225dc5c8c702850892a46d Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 15 Aug 2006 23:30:48 +0000 Subject: - 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 --- src/map/mercenary.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/map/mercenary.c') 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] { -- cgit v1.2.3-70-g09d2