diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-30 04:39:59 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-08-30 04:39:59 +0000 |
| commit | 8ec06e1832af8a2f68bd8d79b7ade09d861a2dea (patch) | |
| tree | 825a318c8d4496eafa5af8edb785700fee0babbc /src/map/mercenary.c | |
| parent | d35ff1c213b7d77cc45c037e950a180c08279cd6 (diff) | |
| download | hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.tar.gz hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.tar.bz2 hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.tar.xz hercules-8ec06e1832af8a2f68bd8d79b7ade09d861a2dea.zip | |
- 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
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 4 |
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; |