From 6f14691e22610707e4ea859c47f44e8a8f8e14a9 Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 1 Sep 2008 03:09:49 +0000 Subject: Removed leftover calls to custom sathena guild_canescape() (see r13161) (bugreport:2154). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13170 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 84ad0f05e..da8eaf022 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3075,7 +3075,7 @@ int pc_isUseitem(struct map_session_data *sd,int n) break; case 601: // Fly Wing case 12212: // Giant Fly Wing - if( map[sd->bl.m].flag.noteleport || map_flag_gvg(sd->bl.m) || !guild_canescape(sd) ) + if( map[sd->bl.m].flag.noteleport || map_flag_gvg(sd->bl.m) ) { clif_skill_teleportmessage(sd,0); return 0; @@ -3093,11 +3093,6 @@ int pc_isUseitem(struct map_session_data *sd,int n) clif_displaymessage(sd->fd, "Duel: Can't use this item in duel."); return 0; } - if( !guild_canescape(sd) ) - { // Guild Wars - clif_displaymessage(sd->fd, "Guild Wars: Cannot escape in battle"); - return 0; - } if( nameid != 601 && nameid != 12212 && map[sd->bl.m].flag.noreturn ) return 0; break; -- cgit v1.2.3-70-g09d2