From 043adb4391aae776a2288fcba9096adcea31b9dc Mon Sep 17 00:00:00 2001 From: Lance Date: Wed, 14 Jun 2006 06:55:27 +0000 Subject: * [Improved]: - npc_parse_script to show information and remove duplicated NPCs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7148 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/npc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/map/npc.c') diff --git a/src/map/npc.c b/src/map/npc.c index 8e4182615..5ba7696d1 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1835,7 +1835,7 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin int startline = 0; unsigned char line[1024]; int i; - struct npc_data *nd; + struct npc_data *nd, *dnd; struct dbt *label_db; char *p; struct npc_label_list *label_dup = NULL; @@ -1967,6 +1967,11 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin nd->bl.type = BL_NPC; nd->bl.subtype = SCRIPT; + if((dnd = npc_name2id(nd->exname))){ + ShowInfo("npc_parse_script: Removing duplicated NPC '%s::%s'...\n", dnd->name, dnd->exname); + npc_unload(dnd); + } + for (i = 0; i < MAX_EVENTTIMER; i++) nd->eventtimer[i] = -1; if (m >= 0) { -- cgit v1.2.3-70-g09d2