From 8ec06e1832af8a2f68bd8d79b7ade09d861a2dea Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 30 Aug 2007 04:39:59 +0000 Subject: - Cleaned up a bit the homunculus evolution code, and fixed homevolution allowing the homunc to 're-evolve' even though it was already evolved. - Optimized a bit the skillheal code in regards to Apple of Idun and Sanctuary git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11090 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/charcommand.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'src/map/charcommand.c') diff --git a/src/map/charcommand.c b/src/map/charcommand.c index 9154048ac..505bf3d37 100644 --- a/src/map/charcommand.c +++ b/src/map/charcommand.c @@ -3755,24 +3755,20 @@ int charcommand_homevolution(const int fd, struct map_session_data* sd, const ch return -1; } - if (pl_sd->hd) - { - if (pl_sd->hd->homunculusDB->evo_class) - { - merc_hom_evolution(pl_sd->hd); - clif_displaymessage(pl_sd->fd, "Homunculus evolution initiated."); - if (pl_sd->fd != fd) - clif_displaymessage(fd, "Homunculus evolution initiated."); - return 0; - } - clif_displaymessage(fd, "Target homunculus cannot evolve."); + if ( !merc_is_hom_active(pl_sd->hd) ) { + clif_displaymessage(fd, "Target player does not have a homunculus."); return -1; } - else - { - clif_displaymessage(fd, "Target player does not have a homunculus."); + + if ( !merc_hom_evolution(pl_sd->hd) ) { + clif_displaymessage(fd, "Target homunculus cannot evolve."); + return -1; } - return -1; + + clif_displaymessage(pl_sd->fd, "Homunculus evolution initiated."); + if (pl_sd->fd != fd) + clif_displaymessage(fd, "Homunculus evolution initiated."); + return 0; } /*========================================== -- cgit v1.2.3-60-g2f50