From 84926b94e869a19f08a7a25df15b4c677316cd32 Mon Sep 17 00:00:00 2001 From: malufett Date: Fri, 22 Feb 2013 02:12:01 +0800 Subject: Fixed Bug #6708 -Where leveling homunculus causes map server to crash due to infinite loop. Signed-off-by: malufett --- src/map/homunculus.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/map/homunculus.c') diff --git a/src/map/homunculus.c b/src/map/homunculus.c index 9a0a1c898..4dc30934d 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -503,11 +503,7 @@ int merc_hom_gainexp(struct homun_data *hd,int exp) } //levelup - do - { - merc_hom_levelup(hd) ; - } - while(hd->homunculus.exp > hd->exp_next && hd->exp_next != 0 ); + while( hd->homunculus.exp > hd->exp_next && merc_hom_levelup(hd) ); if( hd->exp_next == 0 ) hd->homunculus.exp = 0 ; @@ -983,7 +979,7 @@ void merc_reset_stats(struct homun_data *hd) int merc_hom_shuffle(struct homun_data *hd) { struct map_session_data *sd; - int lv, i, skillpts; + int lv, skillpts; unsigned int exp; struct s_skill b_skill[MAX_HOMUNSKILL]; @@ -998,10 +994,9 @@ int merc_hom_shuffle(struct homun_data *hd) //Reset values to level 1. merc_reset_stats(hd); //Level it back up - for (i = 1; i < lv && hd->exp_next; i++){ + do{ hd->homunculus.exp += hd->exp_next; - merc_hom_levelup(hd); - } + }while( hd->homunculus.level < lv && merc_hom_levelup(hd) ); if(hd->homunculus.class_ == hd->homunculusDB->evo_class) { //Evolved bonuses -- cgit v1.2.3-70-g09d2