summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-07 13:06:54 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-07 13:06:54 +0300
commit74a811c80e816b182b70fc2eeefd75cf7800494c (patch)
treebf5edcd09d5a53b7d6deb182dc801946440ac4f2
parent90f9d99976e2053dcf8448c47da615d234d83fbf (diff)
downloadevol-hercules-74a811c80e816b182b70fc2eeefd75cf7800494c.tar.gz
evol-hercules-74a811c80e816b182b70fc2eeefd75cf7800494c.tar.bz2
evol-hercules-74a811c80e816b182b70fc2eeefd75cf7800494c.tar.xz
evol-hercules-74a811c80e816b182b70fc2eeefd75cf7800494c.zip
Remove npc distance checks because it going to upstream.
-rw-r--r--src/map/init.c1
-rw-r--r--src/map/npc.c22
-rw-r--r--src/map/npc.h2
3 files changed, 0 insertions, 25 deletions
diff --git a/src/map/init.c b/src/map/init.c
index b73427f..397be52 100644
--- a/src/map/init.c
+++ b/src/map/init.c
@@ -104,7 +104,6 @@ HPExport void plugin_init (void)
addHookPre("pc->equipitem_pos", epc_equipitem_pos);
addHookPre("pc->unequipitem_pos", epc_unequipitem_pos);
addHookPre("pc->can_attack", epc_can_attack);
- addHookPre("npc->checknear", enpc_checknear);
addHookPre("npc->parse_unknown_mapflag", enpc_parse_unknown_mapflag);
addHookPre("clif->quest_send_list", eclif_quest_send_list);
addHookPre("clif->quest_add", eclif_quest_add);
diff --git a/src/map/npc.c b/src/map/npc.c
index 0fc5c33..7b15491 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -20,28 +20,6 @@
#include "map/struct/npcdext.h"
#include "map/npc.h"
-struct npc_data* enpc_checknear(struct map_session_data* sd, struct block_list* bl)
-{
- struct npc_data *nd;
-
- if (!sd)
- return NULL;
-
- if (bl == NULL)
- return NULL;
- if (bl->type != BL_NPC)
- return NULL;
- nd = (TBL_NPC*)bl;
-
- if (sd->npc_id == bl->id)
- {
- hookStop();
- return nd;
- }
-
- return nd;
-}
-
void enpc_parse_unknown_mapflag(const char *name, char *w3, char *w4, const char* start,
const char* buffer, const char* filepath, int *retval)
{
diff --git a/src/map/npc.h b/src/map/npc.h
index e3cb31a..54685b2 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -4,8 +4,6 @@
#ifndef EVOL_MAP_NPC
#define EVOL_MAP_NPC
-struct npc_data* enpc_checknear(struct map_session_data* sd, struct block_list* bl);
-
void enpc_parse_unknown_mapflag(const char *name, char *w3, char *w4, const char* start,
const char* buffer, const char* filepath, int *retval);