瀏覽代碼

NPC should only have a 24 characters long name including EOS. (bugreport:3599)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14085 54d463be-8e91-2dee-dedb-b68131a5f0ec
Inkfish 15 年之前
父節點
當前提交
6abe64b1d7
共有 3 個文件被更改,包括 4 次插入3 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/npc.h
  3. 1 1
      src/map/script.c

+ 1 - 0
Changelog-Trunk.txt

@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 09/10/10
 	* Added character rename function. [Inkfish]
+	* NPCs' names should only be 24 characters long including EOS. [Inkfish]
 09/10/06
 	* Fixed rental items can be moved into guild storage from cart. [Inkfish]
 09/10/04

+ 2 - 2
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;
 

+ 1 - 1
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);
 	}