summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-03-11 23:05:28 +0100
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-03-14 22:35:09 +0100
commitd92d1772e8dd2fc65fd009247b7009f26ae73b66 (patch)
tree293fad75b2101badfe171d1404e47d3ac1429a43
parent49d0ce1c60455e4971c7bf9c80f4b92ce49f377f (diff)
downloadhercules-d92d1772e8dd2fc65fd009247b7009f26ae73b66.tar.gz
hercules-d92d1772e8dd2fc65fd009247b7009f26ae73b66.tar.bz2
hercules-d92d1772e8dd2fc65fd009247b7009f26ae73b66.tar.xz
hercules-d92d1772e8dd2fc65fd009247b7009f26ae73b66.zip
Remove itemskill_id and itemskill_lv helper variables, since they are not used anymore
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/pc.h9
-rw-r--r--src/map/script.c4
3 files changed, 0 insertions, 15 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 3cfe28a11..8586270b8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5354,8 +5354,6 @@ static int pc_autocast_clear(struct map_session_data *sd)
sd->autocast.itemskill_check_conditions = false;
sd->autocast.itemskill_instant_cast = false;
sd->autocast.itemskill_cast_on_self = false;
- sd->itemskill_id = 0;
- sd->itemskill_lv = 0;
sd->state.itemskill_conditions_checked = 0;
sd->state.itemskill_check_conditions = 0;
sd->state.itemskill_no_casttime = 0;
diff --git a/src/map/pc.h b/src/map/pc.h
index a0566fadc..83b86b68b 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -657,15 +657,6 @@ END_ZEROED_BLOCK;
bool achievements_received;
// Title
VECTOR_DECL(int) title_ids;
-
- /*
- * itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention.
- * If a skill, casted by itemskill() script command, is aborted while target selection,
- * the map server gets no notification where these states could be unset.
- * Thus we need this helper variables to prevent abusing these states for next skill cast.
- */
- int itemskill_id;
- int itemskill_lv;
};
#define EQP_WEAPON EQP_HAND_R
diff --git a/src/map/script.c b/src/map/script.c
index 5e285020f..b8f8d7638 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11030,10 +11030,6 @@ static BUILDIN(itemskill)
sd->autocast.itemskill_instant_cast = ((flag & ISF_INSTANTCAST) == ISF_INSTANTCAST);
sd->autocast.itemskill_cast_on_self = ((flag & ISF_CASTONSELF) == ISF_CASTONSELF);
- // itemskill_conditions_checked/itemskill_no_conditions/itemskill_no_casttime/itemskill_castonself abuse prevention. Unset in pc_autocast_clear().
- sd->itemskill_id = sd->skillitem;
- sd->itemskill_lv = sd->skillitemlv;
-
clif->item_skill(sd, sd->skillitem, sd->skillitemlv);
return true;