diff options
author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-03 00:07:38 +0000 |
---|---|---|
committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-03 00:07:38 +0000 |
commit | 46ad2e09c5a2d2b7a41a47dc07f299147ca4d082 (patch) | |
tree | 7d359747d797d56dec6ea9ebc30d4755f2cd403e | |
parent | edef6edf3ae1e2d1a0db09d3fa81303d18bf3707 (diff) | |
download | hercules-46ad2e09c5a2d2b7a41a47dc07f299147ca4d082.tar.gz hercules-46ad2e09c5a2d2b7a41a47dc07f299147ca4d082.tar.bz2 hercules-46ad2e09c5a2d2b7a41a47dc07f299147ca4d082.tar.xz hercules-46ad2e09c5a2d2b7a41a47dc07f299147ca4d082.zip |
Fixed normal casted Teleport always skip menu.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13839 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 739fd9373..d5ac366ad 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4364,19 +4364,18 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in } clif_skill_nodamage(src,bl,skillid,skilllv,1); - // FIXME: Before r13836, sd->skillitem was never equal to AL_TELEPORT!! - // So, neither normal casted, nor item skill, nor autocasts would skip the menu! What was this intended to do? - // Now, I assume only autocasts teleport may always skip the menu. [Inkfish] + // FIXME: Before r13836, sd->skillitem was never equal to AL_TELEPORT!! So, I don't know what was intened to do. + // Now, Teleport thru items won't show the menu but normal casted and autocasted will. [Inkfish] if( skilllv == 1 ) { - if( !battle_config.skip_teleport_lv1_menu && sd->skillitem == AL_TELEPORT ) // possibility to skip menu [LuzZza] + if( !battle_config.skip_teleport_lv1_menu && sd->skillitem != AL_TELEPORT ) // possibility to skip menu [LuzZza] clif_skill_warppoint(sd,skillid,skilllv, (unsigned short)-1,0,0,0); else pc_randomwarp(sd,3); } else { - if( sd->skillitem == AL_TELEPORT ) + if( sd->skillitem != AL_TELEPORT ) clif_skill_warppoint(sd,skillid,skilllv, (unsigned short)-1,sd->status.save_point.map,0,0); else //Autocasted Teleport level 2?? pc_setpos(sd,sd->status.save_point.map,sd->status.save_point.x,sd->status.save_point.y,3); |