From 5c9beff857dcc37f7fd64f6638a7f748c436c8dc Mon Sep 17 00:00:00 2001 From: toms Date: Fri, 1 Sep 2006 22:27:38 +0000 Subject: [PATCH] The duplicate npc report will now print the related file name git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8582 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/npc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7922cbe144..ad5c8dab34 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/09/01 + * The duplicate npc report will now print the related file name [Toms] * Added config setting "partial_name_scan", which specifies whether @ given names should use a partial string lookup or absolute name lookup. Defaults to no (gm.conf) [Skotlex] diff --git a/src/map/npc.c b/src/map/npc.c index 5ff34647c5..16affe0eba 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1964,7 +1964,7 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line if((dnd = npc_name2id(nd->exname))){ if(battle_config.etc_log) - ShowInfo("npc_parse_script: Overriding NPC '%s::%s' to '%s::%d'.. (Duplicated System Name - Lazy scripters >_>) \n",nd->name,nd->exname,nd->name,npc_script); + ShowInfo("npc_parse_script: Overriding NPC '%s::%s' to '%s::%d'.. in file '%s' (Duplicated System Name - Lazy scripters >_>) \n",nd->name,nd->exname,nd->name,npc_script,file); sprintf(nd->exname, "%d", npc_script); }