From 90f9d99976e2053dcf8448c47da615d234d83fbf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 4 Dec 2014 01:58:21 +0300 Subject: Remove script command setnpcdistance and area distance variable. Now it in upstream. --- src/map/npc.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 8ad68af..0fc5c33 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -24,8 +24,6 @@ struct npc_data* enpc_checknear(struct map_session_data* sd, struct block_list* { struct npc_data *nd; - hookStop(); - if (!sd) return NULL; @@ -36,32 +34,9 @@ struct npc_data* enpc_checknear(struct map_session_data* sd, struct block_list* nd = (TBL_NPC*)bl; if (sd->npc_id == bl->id) - return nd; - - if (nd->class_ < 0) //Class-less npc, enable click from anywhere. - return nd; - - const int npcX = bl->x; - const int npcY = bl->y; - const int x = sd->bl.x; - const int y = sd->bl.y; - - if (bl->m != sd->bl.m - || npcX < x - AREA_SIZE - 1 || npcX > x + AREA_SIZE + 1 - || npcY < y - AREA_SIZE - 1 || npcY > y + AREA_SIZE + 1) - { - return NULL; - } - - struct NpcdExt *data = npcd_get(nd); - if (data) { - const int size = data->areaSize; - if (npcX < x - size || npcX > x + size - || npcY < y - size || npcY > y + size) - { - return NULL; - } + hookStop(); + return nd; } return nd; -- cgit v1.2.3-70-g09d2