|
@@ -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(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)));
|
|
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));
|
|
safestrncpy(nd->exname, newname, sizeof(nd->exname));
|
|
}
|
|
}
|
|
}
|
|
}
|