diff options
| author | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-01 22:27:38 +0000 |
|---|---|---|
| committer | toms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-01 22:27:38 +0000 |
| commit | bf4f37952b5fa4697e16429940dca0d1c4dadda9 (patch) | |
| tree | d6f28dc01d4fe3700c588010d92ccac268fdb5be | |
| parent | a9b1f06e98367bda11817d0c64ae2e8af4471f2b (diff) | |
| download | hercules-bf4f37952b5fa4697e16429940dca0d1c4dadda9.tar.gz hercules-bf4f37952b5fa4697e16429940dca0d1c4dadda9.tar.bz2 hercules-bf4f37952b5fa4697e16429940dca0d1c4dadda9.tar.xz hercules-bf4f37952b5fa4697e16429940dca0d1c4dadda9.zip | |
The duplicate npc report will now print the related file name
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8582 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 7922cbe14..ad5c8dab3 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 5ff34647c..16affe0eb 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);
}
|