summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-04-21 07:43:37 +0200
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-05-10 21:30:33 +0200
commit1f1bc12648dd2dc4a88c5e49164f1142d36c69ea (patch)
treefa38e2f045d9842afc8d1571af324e84dbcda09f
parent134fc00a1906793184ede7ec4351afbf2d204569 (diff)
downloadhercules-1f1bc12648dd2dc4a88c5e49164f1142d36c69ea.tar.gz
hercules-1f1bc12648dd2dc4a88c5e49164f1142d36c69ea.tar.bz2
hercules-1f1bc12648dd2dc4a88c5e49164f1142d36c69ea.tar.xz
hercules-1f1bc12648dd2dc4a88c5e49164f1142d36c69ea.zip
Add pc_autocast_clear_current() calls
-rw-r--r--src/map/pc.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 56a4b938d..d1d224aa7 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5362,14 +5362,7 @@ static int pc_autocast_clear(struct map_session_data *sd)
{
nullpo_ret(sd);
- sd->auto_cast_current.type = AUTOCAST_NONE;
- sd->auto_cast_current.skill_id = 0;
- sd->auto_cast_current.skill_lv = 0;
- sd->auto_cast_current.itemskill_conditions_checked = false;
- sd->auto_cast_current.itemskill_check_conditions = false;
- sd->auto_cast_current.itemskill_instant_cast = false;
- sd->auto_cast_current.itemskill_cast_on_self = false;
-
+ pc->autocast_clear_current(sd);
VECTOR_TRUNCATE(sd->auto_cast); // Truncate auto-cast vector.
return 1;
@@ -5386,13 +5379,7 @@ static void pc_autocast_set_current(struct map_session_data *sd, int skill_id)
{
nullpo_retv(sd);
- sd->auto_cast_current.type = AUTOCAST_NONE;
- sd->auto_cast_current.skill_id = 0;
- sd->auto_cast_current.skill_lv = 0;
- sd->auto_cast_current.itemskill_conditions_checked = false;
- sd->auto_cast_current.itemskill_check_conditions = true;
- sd->auto_cast_current.itemskill_instant_cast = false;
- sd->auto_cast_current.itemskill_cast_on_self = false;
+ pc->autocast_clear_current(sd);
for (int i = 0; i < VECTOR_LENGTH(sd->auto_cast); i++) {
if (VECTOR_INDEX(sd->auto_cast, i).skill_id == skill_id) {