diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-12 22:48:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-12 22:48:56 +0000 |
| commit | 96dd8cdf7ac9778cbb84b7c67f65296b8f723eb5 (patch) | |
| tree | 7a4d8210878c359c60f51c4882253c5565f1cff9 /src/map/mercenary.c | |
| parent | 2b9e300e11b6b36fbbf3626b205b89e84ec4b3ee (diff) | |
| download | hercules-96dd8cdf7ac9778cbb84b7c67f65296b8f723eb5.tar.gz hercules-96dd8cdf7ac9778cbb84b7c67f65296b8f723eb5.tar.bz2 hercules-96dd8cdf7ac9778cbb84b7c67f65296b8f723eb5.tar.xz hercules-96dd8cdf7ac9778cbb84b7c67f65296b8f723eb5.zip | |
- cleaned up homshuffle and fixed a possible crash in it.
- Updated the skill_delayfix function to behave as recently discovered by Tharis: Skills with no delay set will use amotion ONLY if the skill was instant-casted.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11433 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 1477797c5..ff13eacb1 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -836,7 +836,7 @@ void merc_reset_stats(struct homun_data *hd) int merc_hom_shuffle(struct homun_data *hd) { - struct map_session_data *sd = hd->master; + struct map_session_data *sd; int lv, i, skillpts; unsigned int exp; struct skill b_skill[MAX_HOMUNSKILL]; @@ -844,6 +844,7 @@ int merc_hom_shuffle(struct homun_data *hd) if (!merc_is_hom_active(hd)) return 0; + sd = hd->master; lv = hd->homunculus.level; exp = hd->homunculus.exp; memcpy(&b_skill, &hd->homunculus.hskill, sizeof(b_skill)); @@ -856,10 +857,8 @@ int merc_hom_shuffle(struct homun_data *hd) merc_hom_levelup(hd); } - clif_displaymessage(sd->fd, "[Homunculus Stats Altered]"); - - if(!hd->homunculusDB->evo_class || hd->homunculus.class_ == hd->homunculusDB->evo_class) { - // Homunculus Evolucionado + if(hd->homunculus.class_ == hd->homunculusDB->evo_class) { + //Evolved bonuses struct s_homunculus *hom = &hd->homunculus; struct h_stats *max = &hd->homunculusDB->emax, *min = &hd->homunculusDB->emin; hom->max_hp += rand(min->HP, max->HP); @@ -870,7 +869,6 @@ int merc_hom_shuffle(struct homun_data *hd) hom->int_+= 10*rand(min->int_,max->int_); hom->dex += 10*rand(min->dex, max->dex); hom->luk += 10*rand(min->luk, max->luk); - clif_displaymessage(sd->fd, "[Adding Bonus Stats for Evolved Homunculus]"); } hd->homunculus.exp = exp; |