diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-01-25 20:06:13 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-01-25 20:06:13 +0000 |
| commit | 0d9785742ca4554d633c226c2db8fa7a2d255082 (patch) | |
| tree | 2b689304aa2df09f623816315be6538bc64e5258 /src/map/pc.c | |
| parent | 922f62e89a8b3dae0f7e407fae044299988b9ece (diff) | |
| download | hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.tar.gz hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.tar.bz2 hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.tar.xz hercules-0d9785742ca4554d633c226c2db8fa7a2d255082.zip | |
- Implemented new Pet Bonus System. Enjoy!! :D
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13491 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index f094eafce..28e18fd44 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5201,14 +5201,15 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) if(sd->status.pet_id > 0 && sd->pd) { - struct s_pet *pet = &sd->pd->pet; - if(!map[sd->bl.m].flag.noexppenalty){ - pet->intimate -= sd->pd->petDB->die; - if(pet->intimate < 0) - pet->intimate = 0; - clif_send_petdata(sd,sd->pd,1,pet->intimate); - } - if(sd->pd->target_id) // Unlock all targets... + struct pet_data *pd = sd->pd; + if( !map[sd->bl.m].flag.noexppenalty && !flag ) + { + pet_set_intimate(pd, pd->pet.intimate - pd->petDB->die); + if( pd->pet.intimate < 0 ) + pd->pet.intimate = 0; + clif_send_petdata(sd,sd->pd,1,pd->pet.intimate); + } + if( sd->pd->target_id ) // Unlock all targets... pet_unlocktarget(sd->pd); } |