diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-12 14:21:02 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-12 14:21:02 +0000 |
| commit | be57ed26ac11ed0bb696acb031df527e3edf3130 (patch) | |
| tree | 7235600c074836b212efa36e875b16334fe76110 /src/map | |
| parent | e4d1b04f83674a0c0d766b12f906c66473a3e69c (diff) | |
| download | hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.tar.gz hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.tar.bz2 hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.tar.xz hercules-be57ed26ac11ed0bb696acb031df527e3edf3130.zip | |
- 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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mercenary.c | 6 |
1 files changed, 4 insertions, 2 deletions
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);
|