summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-10-11 04:55:57 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-10-11 04:55:57 +0000
commit6a39d505492fd2b6aae97ac25ac876fe15ee83ce (patch)
tree33c579fa5cc8dceff71fc5d7d365389c02fc980d /src/map
parent72351d986315e826c7c32d0de62932067fd98bb8 (diff)
downloadhercules-6a39d505492fd2b6aae97ac25ac876fe15ee83ce.tar.gz
hercules-6a39d505492fd2b6aae97ac25ac876fe15ee83ce.tar.bz2
hercules-6a39d505492fd2b6aae97ac25ac876fe15ee83ce.tar.xz
hercules-6a39d505492fd2b6aae97ac25ac876fe15ee83ce.zip
NPC should only have a 24 characters long name including EOS. (bugreport:3599)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14085 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/npc.h4
-rw-r--r--src/map/script.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.h b/src/map/npc.h
index dcb112966..9aae58d3c 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -31,8 +31,8 @@ struct npc_data {
struct npc_data *master_nd;
short class_;
short speed;
- char name[NAME_LENGTH+1];// display name
- char exname[NAME_LENGTH+1];// unique npc name
+ char name[NAME_LENGTH];// display name
+ char exname[NAME_LENGTH];// unique npc name
int chat_id;
unsigned int next_walktime;
diff --git a/src/map/script.c b/src/map/script.c
index 745a6888b..0d781906c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -13940,7 +13940,7 @@ BUILDIN_FUNC(instance_npcname)
if( instance_id && (nd = npc_name2id(str)) != NULL )
{
- static char npcname[NAME_LENGTH+1];
+ static char npcname[NAME_LENGTH];
snprintf(npcname, sizeof(npcname), "dup_%d_%d", instance_id, nd->bl.id);
script_pushconststr(st,npcname);
}