summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 8dd63724f..577cbf22b 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -289,7 +289,7 @@ int merc_hom_evolution(struct homun_data *hd)
struct map_session_data *sd;
nullpo_retr(0, hd);
- if(!hd->homunculusDB->evo_class)
+ if(!hd->homunculusDB->evo_class || hd->homunculus.class_ == hd->homunculusDB->evo_class)
{
clif_emotion(&hd->bl, 4) ; //swt
return 0 ;
@@ -297,12 +297,12 @@ int merc_hom_evolution(struct homun_data *hd)
sd = hd->master;
if (!sd)
return 0;
-
if (!merc_hom_change_class(hd, hd->homunculusDB->evo_class)) {
ShowError("merc_hom_evolution: Can't evolve homunc from %d to %d", hd->homunculus.class_, hd->homunculusDB->evo_class);
return 0;
}
+
//Apply evolution bonuses
hom = &hd->homunculus;
max = &hd->homunculusDB->emax;