summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-11 13:13:35 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-11 13:13:35 +0000
commit2d61cb61795cd386793c01683ab41b15982a1086 (patch)
treebcbd7defafaa73c557d93aeda2fd2c59e0760a4d
parent369132832b478fdea844555803e9b1dd06692259 (diff)
downloadhercules-2d61cb61795cd386793c01683ab41b15982a1086.tar.gz
hercules-2d61cb61795cd386793c01683ab41b15982a1086.tar.bz2
hercules-2d61cb61795cd386793c01683ab41b15982a1086.tar.xz
hercules-2d61cb61795cd386793c01683ab41b15982a1086.zip
Applied Skotlex's alternative to r12044 (abracadabra fix)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12054 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index a7516a6eb..9c17cf6c0 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3026,15 +3026,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if( sd )
{// player-casted
sd->state.abra_flag = 1;
- if( skill_get_inf(abra_skillid)&INF_SELF_SKILL )
- // non-targeted, execute immediately
- unit_skilluse_id(src, bl->id, abra_skillid, abra_skilllv);
- else
- {// targeted, delay and let player pick target
- sd->skillitem = abra_skillid;
- sd->skillitemlv = abra_skilllv;
- clif_item_skill(sd, abra_skillid, abra_skilllv);
- }
+ sd->skillitem = abra_skillid;
+ sd->skillitemlv = abra_skilllv;
+ clif_item_skill(sd, abra_skillid, abra_skilllv);
}
else
{// mob-casted
@@ -8270,6 +8264,9 @@ int skill_delayfix (struct block_list *bl, int skill_id, int skill_lv)
nullpo_retr(0, bl);
+ if (skill_id == SA_ABRACADABRA)
+ return 0; //Will use picked skill's delay.
+
if (bl->type&battle_config.no_skill_delay)
return battle_config.min_skill_delay_limit;