From 164b880214dc559ca471909acf14b1e28abd8cc6 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 17 Mar 2006 18:58:41 +0000
Subject: - 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
---
 src/map/npc.c   | 2 +-
 src/map/skill.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/map')

diff --git a/src/map/npc.c b/src/map/npc.c
index 5e4797afa..a91892238 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -703,7 +703,7 @@ int npc_timerevent_stop(struct npc_data *nd)
 	*tid = -1;
 	//Set the timer tick to the time that has passed since the beginning of the timers and now.
 	nd->u.scr.timer = DIFF_TICK(gettick(),nd->u.scr.timertick);
-	nd->u.scr.rid = 0;
+//	nd->u.scr.rid = 0; //Eh? why detach?
 	return 0;
 }
 /*==========================================
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;
-- 
cgit v1.2.3-60-g2f50