summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-21 19:33:51 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-21 19:33:51 +0000
commit42d26584d4b8e0bfb3c50bdd5112a4c29003ea42 (patch)
treefcdfe63b18d82ed32fd5aad45276fe60ddcaf2ab /src/map/mercenary.c
parent577e58a1ef5dfc658076c0600663c22e9415f892 (diff)
downloadhercules-42d26584d4b8e0bfb3c50bdd5112a4c29003ea42.tar.gz
hercules-42d26584d4b8e0bfb3c50bdd5112a4c29003ea42.tar.bz2
hercules-42d26584d4b8e0bfb3c50bdd5112a4c29003ea42.tar.xz
hercules-42d26584d4b8e0bfb3c50bdd5112a4c29003ea42.zip
Fixed AM_RESURRECTION, thanks to RockmanEXE for %HP values
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8409 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 6b508429f..53bc562b7 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -820,7 +820,9 @@ int merc_revive_homunculus(struct map_session_data *sd, unsigned char per, short
map_addblock(&sd->hd->bl);
clif_spawn(&sd->hd->bl);
}
- return status_revive(&hd->bl, per, 0);
+ status_revive(&hd->bl, per, 0);
+ sd->homunculus.hp = hd->battle_status.hp;
+ return 1;
}
void merc_homun_revive(struct homun_data *hd, unsigned int hp, unsigned int sp)