diff options
author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-03-11 23:16:29 +0100 |
---|---|---|
committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-03-14 22:35:09 +0100 |
commit | 12de22e7008081c94631c8730d05d487e7b0cfcc (patch) | |
tree | be98aae230d5d4e551640570d876db08949f3ae8 /src/map/skill.c | |
parent | d92d1772e8dd2fc65fd009247b7009f26ae73b66 (diff) | |
download | hercules-12de22e7008081c94631c8730d05d487e7b0cfcc.tar.gz hercules-12de22e7008081c94631c8730d05d487e7b0cfcc.tar.bz2 hercules-12de22e7008081c94631c8730d05d487e7b0cfcc.tar.xz hercules-12de22e7008081c94631c8730d05d487e7b0cfcc.zip |
Remove map_session_data->state.itemskill_* and use map_session_data->autocast.itemskill_* instead
Diffstat (limited to 'src/map/skill.c')
-rw-r--r-- | src/map/skill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 14bc9460e..001c11c36 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -14062,7 +14062,7 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s if (sd->chat_id != 0) return 0; - if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_check_conditions == 0) + if ((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions) && sd->autocast.type == AUTOCAST_ITEM) { return 1; } @@ -15051,7 +15051,7 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski if (sd->chat_id != 0) return 0; - if ((sd->state.itemskill_conditions_checked == 1 || sd->state.itemskill_check_conditions == 0) + if ((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions) && sd->autocast.type == AUTOCAST_ITEM) { return 1; } @@ -15257,7 +15257,7 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i nullpo_ret(sd); - if (sd->state.itemskill_check_conditions == 0 && sd->autocast.type == AUTOCAST_ITEM) + if (!sd->autocast.itemskill_check_conditions && sd->autocast.type == AUTOCAST_ITEM) return 1; req = skill->get_requirement(sd,skill_id,skill_lv); |