From be57ed26ac11ed0bb696acb031df527e3edf3130 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 12 Sep 2006 14:21:02 +0000 Subject: - Moved the packet_len variable in login.c to the login parse case, since it's used nowhere else. - timestamp check speed-up in showmsg.c - Swapped the blank ShowMessage on server startup to a printf - Homunculus intimacy will go back to 500 on evolution. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8719 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index f868ddc2a..24ced263b 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -288,9 +288,11 @@ int merc_hom_evolution(struct homun_data *hd) merc_hom_vaporize(sd, 0); - if (!merc_hom_change_class(hd, hd->homunculusDB->evo_class)) + if (!merc_hom_change_class(hd, hd->homunculusDB->evo_class)) { ShowError("merc_hom_evolution: Can't evoluate homunc from %d to %d", hd->master->homunculus.class_, hd->homunculusDB->evo_class); - + return 0; + } + sd->homunculus.intimacy = 500; merc_call_homunculus(sd, hd->bl.x, hd->bl.y); clif_emotion(&sd->bl, 21); //no1 clif_misceffect2(&hd->bl,568); -- cgit v1.2.3-60-g2f50