diff options
| author | Haru <haru@dotalux.com> | 2016-12-02 20:42:22 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-12-03 15:38:57 +0100 |
| commit | 8a9e589446058b33972aff2c054f8c300b3fd1b7 (patch) | |
| tree | 8e33ef34efc82403409265f6332c32aae801b6a6 /src/map/skill.c | |
| parent | 0f5fdca8945ec3afd5ba2e67a9d414f1ef5565c3 (diff) | |
| download | hercules-8a9e589446058b33972aff2c054f8c300b3fd1b7.tar.gz hercules-8a9e589446058b33972aff2c054f8c300b3fd1b7.tar.bz2 hercules-8a9e589446058b33972aff2c054f8c300b3fd1b7.tar.xz hercules-8a9e589446058b33972aff2c054f8c300b3fd1b7.zip | |
Change the argument to pc->famerank() to a rank type (instead of job mapid)
For consistency with `pc->addfame()`, the argument to pc->famerank() is
now an enum fame_list_type.
The function was renamed to `pc->fame_rank()` to avoid silently
compiling old non-compliant code.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 41135920f..51a8a28e7 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2430,7 +2430,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr case TK_STORMKICK: case TK_DOWNKICK: case TK_COUNTER: - if (pc->famerank(sd->status.char_id,MAPID_TAEKWON)) {//Extend combo time. + if (pc->fame_rank(sd->status.char_id, RANKTYPE_TAEKWON) > 0) { //Extend combo time. sce->val1 = skill_id; //Update combo-skill sce->val3 = skill_id; if( sce->timer != INVALID_TIMER ) @@ -13758,7 +13758,8 @@ int skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_id status_change_end(&sd->bl, SC_COMBOATTACK, INVALID_TIMER); return 0; } - if(sc->data[SC_COMBOATTACK]->val1 != skill_id && !( sd && sd->status.base_level >= 90 && pc->famerank(sd->status.char_id, MAPID_TAEKWON) )) { + if (sc->data[SC_COMBOATTACK]->val1 != skill_id + && !(sd != NULL && sd->status.base_level >= 90 && pc->fame_rank(sd->status.char_id, RANKTYPE_TAEKWON) > 0)) { //Cancel combo wait. unit->cancel_combo(&sd->bl); return 0; |