From bdfb9e2e0ecd034ef1d1ceab426bdafea028f3b3 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 21 Aug 2006 19:53:03 +0000 Subject: - Homun saving won't cap hp/sp to max hp/sp since a homun can have higher hp/sp than the one stated in the db (due to skill bonuses or status changes) - Increased splash range of HVAN_EXPLOSION to 4. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8411 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 53bc562b7..46108fbb6 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -424,10 +424,11 @@ void merc_save(struct homun_data *hd) { // copy data that must be saved in homunculus struct ( hp / sp ) TBL_PC * sd = hd->master; - if((sd->homunculus.hp = hd->battle_status.hp) > sd->homunculus.max_hp ) - sd->homunculus.hp = sd->homunculus.max_hp; - if((sd->homunculus.sp = hd->battle_status.sp) > sd->homunculus.max_sp ) - sd->homunculus.sp = sd->homunculus.max_sp; + //Do not check for max_hp/max_sp caps as current could be higher to max due + //to status changes/skills (they will be capped as needed upon stat + //calculation on login) + sd->homunculus.hp = hd->battle_status.hp; + sd->homunculus.sp = hd->battle_status.sp; intif_homunculus_requestsave(sd->status.account_id, &sd->homunculus) ; } -- cgit v1.2.3-70-g09d2