summaryrefslogtreecommitdiff
path: root/src/map/atcommand.c
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-31 23:12:20 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-31 23:12:20 +0000
commit3164de460e7ae3ed02ca66324b93a0fc8b3a8226 (patch)
treed633a23dc58dd5f96717c929668a20edee8df0e0 /src/map/atcommand.c
parentdf317b7df04c9534dc7fee9702bd425e56ed8f06 (diff)
downloadhercules-3164de460e7ae3ed02ca66324b93a0fc8b3a8226.tar.gz
hercules-3164de460e7ae3ed02ca66324b93a0fc8b3a8226.tar.bz2
hercules-3164de460e7ae3ed02ca66324b93a0fc8b3a8226.tar.xz
hercules-3164de460e7ae3ed02ca66324b93a0fc8b3a8226.zip
* Added display name to warps created with `@addwarp`, so their name is visible in `@mapinfo 2` (bugreport:1491).
* `@mapinfo 2` now also displays unique NPC name if it's different than display name. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15534 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
-rw-r--r--src/map/atcommand.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 716eb8f74..64b005aae 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4601,8 +4601,12 @@ ACMD_FUNC(mapinfo)
case 9: strcpy(direction, "North"); break;
default: strcpy(direction, "Unknown"); break;
}
- sprintf(atcmd_output, "NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d",
- ++i, nd->name, direction, nd->class_, nd->bl.x, nd->bl.y);
+ if(strcmp(nd->name,nd->exname) == 0)
+ sprintf(atcmd_output, "NPC %d: %s | Direction: %s | Sprite: %d | Location: %d %d",
+ ++i, nd->name, direction, nd->class_, nd->bl.x, nd->bl.y);
+ else
+ sprintf(atcmd_output, "NPC %d: %s::%s | Direction: %s | Sprite: %d | Location: %d %d",
+ ++i, nd->name, nd->exname, direction, nd->class_, nd->bl.x, nd->bl.y);
clif_displaymessage(fd, atcmd_output);
}
break;