* Commented out ShowWarning and ShowDebug messages added in revision 11508. Aside from the ShowDebug being faulty, they are both fare too annoying for public use for the time being. If/when I get the NPC names fixed, we can add it back.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11511 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 11 insertions, 3 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2b00ed4fd..e3b1f3fda 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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.
 
 2007/10/18
+	* Rev. 11511 Commented out ShowWarning and ShowDebug messages added [L0ne_W0lf]
+	  in revision 11508. Aside from the ShowDebug being faulty, they
+	  are both fare too annoying for public use for the time being.
+	  If/when I get the NPC names fixed, we can add it back.
 	* Further optimization of the skill unit code [Playtester]
 	- removed code for Crimson Fire Formation it now uses the same code as Fire Wall
 	- added same knockback behavior as Fire Wall for Fire Formation
diff --git a/src/map/npc.c b/src/map/npc.c
index 9b86ff367..e7204be52 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1476,9 +1476,13 @@ static void npc_parsename(struct npc_data* nd, const char* name, const char* sta
 		strcpy(this_mapname, (nd->bl.m==-1?"(not on a map)":mapindex_id2name(nd->bl.m)));
 		strcpy(other_mapname, (dnd->bl.m==-1?"(not on a map)":mapindex_id2name(dnd->bl.m)));
 
-		ShowWarning("npc_parsename: Duplicate unique name in file '%s', line'%d'. Renaming '%s' to '%s'.\n", filepath, strline(buffer,start-buffer), nd->exname, newname);
-		ShowDebug("this npc:\n   display name '%s'\n   unique name '%s'\n   map=%s, x=%d, y=%d\n", nd->name, nd->exname, this_mapname, nd->bl.x, nd->bl.y);
-		ShowDebug("other npc:\n   display name '%s'\n   unique name '%s'\n   map=%s, x=%d, y=%d\n", dnd->name, dnd->exname, other_mapname, dnd->bl.x, dnd->bl.y);
+		//Commented out by ME-- L0ne_W0lf, and maybe one day we'll uncomment it again
+		//if and when I decide to/get all the warnings nad debug messages this horrible
+		//BROKEN thing ever shows.
+		//By the way, this_map and other_map are both WRONG. They are retuirning invalid results.
+		//ShowWarning("npc_parsename: Duplicate unique name in file '%s', line'%d'. Renaming '%s' to '%s'.\n", filepath, strline(buffer,start-buffer), nd->exname, newname);
+		//ShowDebug("this npc:\n   display name '%s'\n   unique name '%s'\n   map=%s, x=%d, y=%d\n", nd->name, nd->exname, this_mapname, nd->bl.x, nd->bl.y);
+		//ShowDebug("other npc:\n   display name '%s'\n   unique name '%s'\n   map=%s, x=%d, y=%d\n", dnd->name, dnd->exname, other_mapname, dnd->bl.x, dnd->bl.y);
 		safestrncpy(nd->exname, newname, sizeof(nd->exname));
 	}
 }