summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-17 18:58:41 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-17 18:58:41 +0000
commit164b880214dc559ca471909acf14b1e28abd8cc6 (patch)
treeb87f6b0b52adf1075a9f3971fcb4a191490904f3 /src/map/skill.c
parent2014f1558e424573427e75224eb133cba19d777a (diff)
downloadhercules-164b880214dc559ca471909acf14b1e28abd8cc6.tar.gz
hercules-164b880214dc559ca471909acf14b1e28abd8cc6.tar.bz2
hercules-164b880214dc559ca471909acf14b1e28abd8cc6.tar.xz
hercules-164b880214dc559ca471909acf14b1e28abd8cc6.zip
- Removed a block of code from skill_check_condition that actually belongs to status_check_skilluse.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5651 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 222111f6a..3edd9d474 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7665,6 +7665,7 @@ int skill_check_condition(struct map_session_data *sd,int type)
sd->skillitem = sd->skillitemlv = -1;
return 1;
}
+ /* These two are part of status_check_skilluse now.
if( sd->sc.opt1 ){
clif_skill_fail(sd,sd->skillid,0,0);
return 0;
@@ -7677,10 +7678,10 @@ int skill_check_condition(struct map_session_data *sd,int type)
sd->sc.data[SC_BERSERK].timer != -1 ||
(sd->sc.data[SC_MARIONETTE].timer != -1 && sd->skillid != CG_MARIONETTE)){
clif_skill_fail(sd,sd->skillid,0,0);
- return 0; /* ?‘ÔˆÙ?í‚â’¾?‚È‚Ç */
+ return 0;
}
}
-
+ */
skill = sd->skillid;
lv = sd->skilllv;
if (lv <= 0) return 0;