diff options
| author | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-03-12 00:24:35 +0100 |
|---|---|---|
| committer | Kenpachi Developer <Kenpachi.Developer@gmx.de> | 2020-03-14 22:35:10 +0100 |
| commit | 44581f9de0df3ab18b719e55f793dc22bd2fcb72 (patch) | |
| tree | 5c26e03b55e19a87132e4adc36de109c380efcca /src/map/script.c | |
| parent | 10312bc4329e16a4b4420131cb976ef9fa6a13f5 (diff) | |
| download | hercules-44581f9de0df3ab18b719e55f793dc22bd2fcb72.tar.gz hercules-44581f9de0df3ab18b719e55f793dc22bd2fcb72.tar.bz2 hercules-44581f9de0df3ab18b719e55f793dc22bd2fcb72.tar.xz hercules-44581f9de0df3ab18b719e55f793dc22bd2fcb72.zip | |
Remove skillitem and skillitemlv variables and use map_session_data->autocast.skill_id/_lv instead
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/script.c b/src/map/script.c index 6ed94bc92..2c8ce683e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11005,16 +11005,14 @@ static BUILDIN(itemskill) sd->autocast.type = AUTOCAST_ITEM; sd->autocast.skill_id = script_isstringtype(st, 2) ? skill->name2id(script_getstr(st, 2)) : script_getnum(st, 2); sd->autocast.skill_lv = script_getnum(st, 3); - sd->skillitem = script_isstringtype(st, 2) ? skill->name2id(script_getstr(st, 2)) : script_getnum(st, 2); - sd->skillitemlv = script_getnum(st, 3); int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE; sd->autocast.itemskill_check_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS); if (sd->autocast.itemskill_check_conditions) { - if (skill->check_condition_castbegin(sd, sd->skillitem, sd->skillitemlv) == 0 - || skill->check_condition_castend(sd, sd->skillitem, sd->skillitemlv) == 0) { + if (skill->check_condition_castbegin(sd, sd->autocast.skill_id, sd->autocast.skill_lv) == 0 + || skill->check_condition_castend(sd, sd->autocast.skill_id, sd->autocast.skill_lv) == 0) { pc->autocast_clear(sd); return true; } @@ -11025,7 +11023,7 @@ static BUILDIN(itemskill) sd->autocast.itemskill_instant_cast = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST); sd->autocast.itemskill_cast_on_self = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF); - clif->item_skill(sd, sd->skillitem, sd->skillitemlv); + clif->item_skill(sd, sd->autocast.skill_id, sd->autocast.skill_lv); return true; } |