From f90e54575306dc6391fc3348311626942fb3e111 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Fri, 6 Mar 2020 10:13:30 +0100 Subject: Rename ISF_IGNORECONDITIONS to ISF_CHECKCONDITIONS --- src/map/script.c | 4 ++-- src/map/script.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/map/script.c b/src/map/script.c index 5714e5370..5a8907a87 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11008,7 +11008,7 @@ static BUILDIN(itemskill) int flag = script_hasdata(st, 4) ? script_getnum(st, 4) : ISF_NONE; - sd->state.itemskill_no_conditions = ((flag & ISF_IGNORECONDITIONS) == ISF_IGNORECONDITIONS) ? 1 : 0; // Unset in pc_itemskill_clear(). + sd->state.itemskill_no_conditions = ((flag & ISF_CHECKCONDITIONS) == ISF_CHECKCONDITIONS) ? 1 : 0; // Unset in pc_itemskill_clear(). if (sd->state.itemskill_no_conditions == 0) { if (skill->check_condition_castbegin(sd, sd->skillitem, sd->skillitemlv) == 0 @@ -27860,7 +27860,7 @@ static void script_hardcoded_constants(void) script->constdb_comment("itemskill option flags"); script->set_constant("ISF_NONE", ISF_NONE, false, false); - script->set_constant("ISF_IGNORECONDITIONS", ISF_IGNORECONDITIONS, false, false); + script->set_constant("ISF_CHECKCONDITIONS", ISF_CHECKCONDITIONS, false, false); script->set_constant("ISF_INSTANTCAST", ISF_INSTANTCAST, false, false); script->set_constant("ISF_CASTONSELF", ISF_CASTONSELF, false, false); diff --git a/src/map/script.h b/src/map/script.h index 857d22c61..7dc2b790a 100644 --- a/src/map/script.h +++ b/src/map/script.h @@ -569,7 +569,7 @@ enum mado_type { **/ enum itemskill_flag { ISF_NONE = 0x00, - ISF_IGNORECONDITIONS = 0x01, // Ignore skill conditions and don't consume them. + ISF_CHECKCONDITIONS = 0x01, // Check skill conditions and consume them. ISF_INSTANTCAST = 0x02, // Cast skill instantaneously. ISF_CASTONSELF = 0x04, // Forcefully cast skill on invoking character without showing the target selection cursor. }; -- cgit v1.2.3-60-g2f50