Selaa lähdekoodia

Partially revert r14085, NPC names are allowed to be more than 24 character long in Aegis.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14087 54d463be-8e91-2dee-dedb-b68131a5f0ec
Inkfish 15 vuotta sitten
vanhempi
commit
137e993d52
2 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 2 2
      src/map/atcommand.c
  2. 2 2
      src/map/npc.h

+ 2 - 2
src/map/atcommand.c

@@ -4730,12 +4730,12 @@ int atcommand_loadnpc(const int fd, struct map_session_data* sd, const char* com
 int atcommand_unloadnpc(const int fd, struct map_session_data* sd, const char* command, const char* message)
 {
 	struct npc_data *nd;
-	char NPCname[NAME_LENGTH];
+	char NPCname[NAME_LENGTH+1];
 	nullpo_retr(-1, sd);
 
 	memset(NPCname, '\0', sizeof(NPCname));
 
-	if (!message || !*message || sscanf(message, "%23[^\n]", NPCname) < 1) {
+	if (!message || !*message || sscanf(message, "%24[^\n]", NPCname) < 1) {
 		clif_displaymessage(fd, "Please, enter a NPC name (usage: @npcoff <NPC_name>).");
 		return -1;
 	}

+ 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];// display name
-	char exname[NAME_LENGTH];// unique npc name
+	char name[NAME_LENGTH+1];// display name
+	char exname[NAME_LENGTH+1];// unique npc name
 	int chat_id;
 	unsigned int next_walktime;