summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-24 03:10:30 +0000
committer(no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-24 03:10:30 +0000
commitaebf55791c3d68004f09580ac3ae70b45fa5f353 (patch)
tree0895ad12fd7d66c8bb940c1c2ddcf49aef46dfd1 /src
parent42cb65ffe692ccb12623fbc9af12e31f7678d33c (diff)
downloadhercules-aebf55791c3d68004f09580ac3ae70b45fa5f353.tar.gz
hercules-aebf55791c3d68004f09580ac3ae70b45fa5f353.tar.bz2
hercules-aebf55791c3d68004f09580ac3ae70b45fa5f353.tar.xz
hercules-aebf55791c3d68004f09580ac3ae70b45fa5f353.zip
Updated restrictions for Call partner and Emergency Recall abit
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@339 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index eb84c7598..0b734d41a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4237,14 +4237,14 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int
case WE_CALLPARTNER: /* あなたに?いたい */
if(sd && dstsd){
- if(map[sd->bl.m].flag.nomemo){
- clif_skill_teleportmessage(sd,1);
- return 0;
- }
if((dstsd = pc_get_partner(sd)) == NULL){
clif_skill_fail(sd,skillid,0,0);
return 0;
}
+ if(map[sd->bl.m].flag.nomemo || map[sd->bl.m].flag.nowarpto || map[dstsd->bl.m].flag.nowarp){
+ clif_skill_teleportmessage(sd,1);
+ return 0;
+ }
skill_unitsetting(src,skillid,skilllv,sd->bl.x,sd->bl.y,0);
}
break;
@@ -4450,7 +4450,7 @@ int skill_castend_nodamage_id( struct block_list *src, struct block_list *bl,int
for(i = 0; i < g->max_member; i++, j++) {
if (j>8) j=0;
if ((dstsd = g->member[i].sd) != NULL && sd != dstsd &&
- !map[sd->bl.m].flag.nowarpto && !map[sd->bl.m].flag.nowarp) {
+ !map[sd->bl.m].flag.nowarpto && !map[dstsd->bl.m].flag.nowarp) {
clif_skill_nodamage(src,bl,skillid,skilllv,1);
pc_setpos(dstsd, sd->mapname, sd->bl.x+dx[j], sd->bl.y+dy[j], 2);
}