diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-02 14:19:56 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-02 14:19:56 +0000 |
| commit | d90b2e20d916b9539060dcdb33d13bb41aa1bb89 (patch) | |
| tree | f6779bc22680926c01a73fb2e69d74f0d2991452 /src/map/pc.c | |
| parent | c465de040071d547c25af3856683d3a137832e8e (diff) | |
| download | hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.tar.gz hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.tar.bz2 hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.tar.xz hercules-d90b2e20d916b9539060dcdb33d13bb41aa1bb89.zip | |
- Renamed nopenalty mapflag to noexppenalty. Using nopenalty will turn on/off both noexppenalty and nozenypenalty now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8915 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index cb641b3cf..822581272 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4822,7 +4822,7 @@ 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.nopenalty){ + if(!map[sd->bl.m].flag.noexppenalty){ pet->intimate -= sd->pd->petDB->die; if(pet->intimate < 0) pet->intimate = 0; @@ -4970,7 +4970,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src) // changed penalty options, added death by player if pk_mode [Valaris] if(battle_config.death_penalty_type && sd->state.snovice_flag != 4 && (sd->class_&MAPID_UPPERMASK) != MAPID_NOVICE // only novices will receive no penalty - && !map[sd->bl.m].flag.nopenalty && !map_flag_gvg(sd->bl.m) + && !map[sd->bl.m].flag.noexppenalty && !map_flag_gvg(sd->bl.m) && sd->sc.data[SC_BABY].timer == -1) { unsigned int base_penalty =0; |