diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 19:53:03 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-21 19:53:03 +0000 |
| commit | bdfb9e2e0ecd034ef1d1ceab426bdafea028f3b3 (patch) | |
| tree | edbcdc5aa20485fd0621228c6de62d31c4bcec3f /src/map/mercenary.c | |
| parent | 02f26bfab461a31f5890b4ab2f58b77f5404abf5 (diff) | |
| download | hercules-bdfb9e2e0ecd034ef1d1ceab426bdafea028f3b3.tar.gz hercules-bdfb9e2e0ecd034ef1d1ceab426bdafea028f3b3.tar.bz2 hercules-bdfb9e2e0ecd034ef1d1ceab426bdafea028f3b3.tar.xz hercules-bdfb9e2e0ecd034ef1d1ceab426bdafea028f3b3.zip | |
- 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
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 9 |
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) ;
}
|