diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-04-21 06:33:17 +0200 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-05-10 21:30:29 +0200 |
| commit | 94e9efa489b74ebed374dc7346a6605e43dedd85 (patch) | |
| tree | 45da30097af91d6ab2aed1974410e640c74234af /src/map/clif.c | |
| parent | f52be55dc66ff5adcf6e00f55abc5d91bd89e798 (diff) | |
| download | hercules-94e9efa489b74ebed374dc7346a6605e43dedd85.tar.gz hercules-94e9efa489b74ebed374dc7346a6605e43dedd85.tar.bz2 hercules-94e9efa489b74ebed374dc7346a6605e43dedd85.tar.xz hercules-94e9efa489b74ebed374dc7346a6605e43dedd85.zip | |
Use auto_cast_current instead of autocast
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 6595e6f57..d9b2816bd 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6766,7 +6766,7 @@ static void clif_item_skill(struct map_session_data *sd, uint16 skill_id, uint16 struct PACKET_ZC_AUTORUN_SKILL *p = WFIFOP(fd, 0); int type = skill->get_inf(skill_id); - if (sd->autocast.itemskill_cast_on_self && sd->autocast.type == AUTOCAST_ITEM) + if (sd->auto_cast_current.itemskill_cast_on_self && sd->auto_cast_current.type == AUTOCAST_ITEM) type = INF_SELF_SKILL; p->packetType = HEADER_ZC_AUTORUN_SKILL; @@ -12812,7 +12812,7 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill * for the auto-cast data validation if skill_lv is 0. * **/ - skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->autocast.skill_lv : skill_lv); + skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->auto_cast_current.skill_lv : skill_lv); if (skill_lv < 1) skill_lv = 1; //No clue, I have seen the client do this with guild skills :/ [Skotlex] @@ -12867,7 +12867,7 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill if (skill_id != SA_CASTCANCEL && skill_id != SO_SPELLFIST) return; } else if (DIFF_TICK(tick, sd->ud.canact_tick) < 0) { - if (sd->autocast.type == AUTOCAST_NONE) { + if (sd->auto_cast_current.type == AUTOCAST_NONE) { clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0); return; } @@ -12885,9 +12885,9 @@ static void clif_useSkillToIdReal(int fd, struct map_session_data *sd, int skill } else if (sd->menuskill_id != SA_AUTOSPELL) return; //Can't use skills while a menu is open. } - if (sd->autocast.type != AUTOCAST_NONE) { - if (skill_lv != sd->autocast.skill_lv) - skill_lv = sd->autocast.skill_lv; + if (sd->auto_cast_current.type != AUTOCAST_NONE) { + if (skill_lv != sd->auto_cast_current.skill_lv) + skill_lv = sd->auto_cast_current.skill_lv; if (!(tmp&INF_SELF_SKILL)) pc->delinvincibletimer(sd); // Target skills through items cancel invincibility. [Inkfish] unit->skilluse_id(&sd->bl, target_id, skill_id, skill_lv); @@ -12965,7 +12965,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin * since clif_item_skill() is only used for auto-cast skills. * **/ - skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->autocast.skill_lv : skill_lv); + skill->validate_autocast_data(sd, skill_id, (skill_lv == 0) ? sd->auto_cast_current.skill_lv : skill_lv); if( !(skill->get_inf(skill_id)&INF_GROUND_SKILL) ) return; //Using a target skill on the ground? WRONG. @@ -13007,7 +13007,7 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin return; if( DIFF_TICK(tick, sd->ud.canact_tick) < 0 ) { - if (sd->autocast.type == AUTOCAST_NONE) { + if (sd->auto_cast_current.type == AUTOCAST_NONE) { clif->skill_fail(sd, skill_id, USESKILL_FAIL_SKILLINTERVAL, 0, 0); return; } @@ -13028,9 +13028,9 @@ static void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uin pc->delinvincibletimer(sd); - if (sd->autocast.type != AUTOCAST_NONE) { - if (skill_lv != sd->autocast.skill_lv) - skill_lv = sd->autocast.skill_lv; + if (sd->auto_cast_current.type != AUTOCAST_NONE) { + if (skill_lv != sd->auto_cast_current.skill_lv) + skill_lv = sd->auto_cast_current.skill_lv; unit->skilluse_pos(&sd->bl, x, y, skill_id, skill_lv); } else { int lv; |