- Corrected the @follow timer not being deleted on logout.

- Applied the homunculus code fixes provided by Toms.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7820 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 11 insertions, 8 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index a415fb7c7..9521f7071 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -54,14 +54,6 @@ void merc_load_exptables(void);
 int mercskill_castend_id( int tid, unsigned int tick, int id,int data );

 static int merc_hom_hungry(int tid,unsigned int tick,int id,int data);

 

-int do_init_merc (void)

-{

-	merc_load_exptables();

-	memset(homunculus_db,0,sizeof(homunculus_db));	//[orn]

-	read_homunculusdb();	//[orn]

-	return 0;

-}

-

 static unsigned long hexptbl[MAX_LEVEL+1];

 

 void merc_load_exptables(void)

@@ -1089,4 +1081,15 @@ int read_homunculusdb()
 	return 0;

 }

 

+int do_init_merc (void)

+{

+	merc_load_exptables();

+	memset(homunculus_db,0,sizeof(homunculus_db));	//[orn]

+	read_homunculusdb();	//[orn]

+	// Add homunc timer function to timer func list [Toms]

+	add_timer_func_list(merc_natural_heal, "merc_natural_heal");

+	add_timer_func_list(merc_hom_hungry, "merc_hom_hungry");

+	return 0;

+}

+

 int do_final_merc (void);