diff options
| author | Haru <haru@dotalux.com> | 2020-04-05 23:10:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-05 23:10:48 +0200 |
| commit | c7ad2580c502dfed6d4fe34907758cd93ddfded3 (patch) | |
| tree | 6fe8bab9014587acbc09bf0750afabee840c6199 /src/map/status.c | |
| parent | b996ad73974b282a15db217fcbac5f284be3fdd5 (diff) | |
| parent | fb0e6a0172124df95ce32d6ad0b3b4cb85747f6d (diff) | |
| download | hercules-c7ad2580c502dfed6d4fe34907758cd93ddfded3.tar.gz hercules-c7ad2580c502dfed6d4fe34907758cd93ddfded3.tar.bz2 hercules-c7ad2580c502dfed6d4fe34907758cd93ddfded3.tar.xz hercules-c7ad2580c502dfed6d4fe34907758cd93ddfded3.zip | |
Merge pull request #2600 from Kenpachi2k13/issue#2434
Preparation for upcoming pet DB update.
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c index 4e7094569..d3e85e5be 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2579,12 +2579,16 @@ static int status_calc_pc_(struct map_session_data *sd, enum e_status_calc_opt o status->calc_pc_additional(sd, opt); - if( sd->pd ) { // Pet Bonus + if (sd->pd != NULL) { // Pet bonus. struct pet_data *pd = sd->pd; - if( pd && pd->petDB && pd->petDB->equip_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly ) - script->run(pd->petDB->equip_script,0,sd->bl.id,0); - if( pd && pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus ) - pc->bonus(sd,pd->bonus->type, pd->bonus->val); + + if (pd->petDB != NULL && pd->petDB->equip_script != NULL) + script->run(pd->petDB->equip_script, 0, sd->bl.id, 0); + + if (pd->pet.intimate > PET_INTIMACY_NONE && pd->state.skillbonus == 1 && pd->bonus != NULL + && (battle_config.pet_equip_required == 0 || pd->pet.equip > 0)) { + pc->bonus(sd, pd->bonus->type, pd->bonus->val); + } } //param_bonus now holds card bonuses. |