summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c9
1 files changed, 5 insertions, 4 deletions
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) ;
}