Applied a temp patch to make some npc-executed atcommands work again (bugreport:790).

Added support for right-click-gm-menu kicking NPC objects.
Removed redundant function npc_checknear2().

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12073 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 0 insertions, 22 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index f2601e1e9..27110a996 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -869,28 +869,6 @@ int npc_check_areanpc(int flag, int m, int x, int y, int range)
 	return (map[m].npc[i]->bl.id);
 }
 
-/*==========================================
- * 近くかどうかの判定
- *------------------------------------------*/
-int npc_checknear2(struct map_session_data* sd, struct block_list* bl)
-{
-	nullpo_retr(1, sd);
-	if(bl == NULL) return 1;
-	
-	if(sd->state.using_fake_npc && sd->npc_id == bl->id)
-		return 0;
-
-	if (status_get_class(bl)<0) //Class-less npc, enable click from anywhere.
-		return 0;
-
-	if (bl->m!=sd->bl.m ||
-	   bl->x<sd->bl.x-AREA_SIZE-1 || bl->x>sd->bl.x+AREA_SIZE+1 ||
-	   bl->y<sd->bl.y-AREA_SIZE-1 || bl->y>sd->bl.y+AREA_SIZE+1)
-		return 1;
-
-	return 0;
-}
-
 struct npc_data* npc_checknear(struct map_session_data* sd, struct block_list* bl)
 {
 	struct npc_data *nd;