diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-10 23:34:35 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-10 23:34:35 +0000 |
| commit | 1da444ee4f4c92bc69c9e2e897e0bf4674e52bc8 (patch) | |
| tree | 0d86857c93f00868dc755cd6332516fa41fb01d0 /src/map/skill.c | |
| parent | aa8f497e6714b4f93c6ea81a99ebd96d0c3501ef (diff) | |
| download | hercules-1da444ee4f4c92bc69c9e2e897e0bf4674e52bc8.tar.gz hercules-1da444ee4f4c92bc69c9e2e897e0bf4674e52bc8.tar.bz2 hercules-1da444ee4f4c92bc69c9e2e897e0bf4674e52bc8.tar.xz hercules-1da444ee4f4c92bc69c9e2e897e0bf4674e52bc8.zip | |
Code cleanup on homunc, they stay in memory until player disconnect or homunc destruction
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8241 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 8691aaff0..0e90ee189 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5489,7 +5489,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case AM_CALLHOMUN: //[orn] if (sd) { - if ((sd->status.hom_id == 0 || sd->homunculus.vaporize == 1)) { + if (sd->status.hom_id == 0 || sd->homunculus.vaporize == 1) { if (sd->status.hom_id == 0) { i = pc_search_inventory(sd,7142); if(i < 0) { @@ -5509,12 +5509,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in { if (sd) { - if (sd->hd && ( sd->hd->battle_status.hp >= (sd->hd->battle_status.max_hp * 80 / 100 ) ) ) { + if (sd->hd && !sd->homunculus.vaporize && ( sd->hd->battle_status.hp >= (sd->hd->battle_status.max_hp * 80 / 100 ) ) ) { sd->homunculus.vaporize = 1; clif_hominfo(sd, sd->hd, 0); merc_hom_delete(sd->hd, 0) ; - } - clif_skill_fail(sd,skillid,0,0); + } else + clif_skill_fail(sd,skillid,0,0); } break; } |