summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-13 04:25:34 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-13 04:25:34 +0000
commit0580db8bf96e58c76f0b743003fb707a8dc2e4de (patch)
treecfcecad381801d6234c43c07bfcbede9831f05fe /src/map/skill.c
parente0e8a5606bfce797c57e0adad39f174957f6bc49 (diff)
downloadhercules-0580db8bf96e58c76f0b743003fb707a8dc2e4de.tar.gz
hercules-0580db8bf96e58c76f0b743003fb707a8dc2e4de.tar.bz2
hercules-0580db8bf96e58c76f0b743003fb707a8dc2e4de.tar.xz
hercules-0580db8bf96e58c76f0b743003fb707a8dc2e4de.zip
* If both Double Attack and critical attack have chance to trigger within one attack, Double Attack takes priority. (bugreport:3231)
* Fixed Butterfly Wings not working on maps blocking Teleport. (bugreport:3236) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13886 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 63640656f..bfe20c8c9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -384,13 +384,12 @@ int skillnotok (int skillid, struct map_session_data *sd)
return 1;
}
return 0;
- break;
case AL_TELEPORT:
- if(map[m].flag.noteleport) {
- clif_skill_teleportmessage(sd,0);
- return 1;
- }
- return 0;
+ // if(map[m].flag.noteleport) {
+ // clif_skill_teleportmessage(sd,0);
+ // return 1;
+ // }
+ return 0; // gonna be checked in 'skill_castend_nodamage_id'
case WE_CALLPARTNER:
case WE_CALLPARENT:
case WE_CALLBABY:
@@ -4388,11 +4387,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
case AL_TELEPORT:
if(sd)
{
- if (map[bl->m].flag.noteleport) {
+ if (map[bl->m].flag.noteleport && skilllv <= 2) {
clif_skill_teleportmessage(sd,0);
break;
}
- if(!battle_config.duel_allow_teleport && sd->duel_group) { // duel restriction [LuzZza]
+ if(!battle_config.duel_allow_teleport && sd->duel_group && skilllv <= 2) { // duel restriction [LuzZza]
clif_displaymessage(sd->fd, "Duel: Can't use teleport in duel.");
break;
}