瀏覽代碼

* Removed impossible condition in mob_parse_dataset as spawn_data::eventname was/is the same size as mob_data::npc_event (since r5707).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14816 54d463be-8e91-2dee-dedb-b68131a5f0ec
ai4rei 14 年之前
父節點
當前提交
f34de92ef0
共有 2 個文件被更改,包括 2 次插入5 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 1 5
      src/map/mob.c

+ 1 - 0
Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 2011/05/14
+	* Removed impossible condition in mob_parse_dataset as spawn_data::eventname was/is the same size as mob_data::npc_event (since r5707). [Ai4rei]
 	* Fixed map-server printing deprecation message, when monster event label was used as transport for special attributes (small/large monsters etc.) in script command 'monster' and related commands (bugreport:1274, since r6592, related r5707). [Ai4rei]
 2011/05/13
 	* Random accumulated bits and pieces. [Ai4rei]

+ 1 - 5
src/map/mob.c

@@ -173,10 +173,6 @@ int mob_parse_dataset(struct spawn_data *data)
 	if ((!mobdb_checkid(data->class_) && !mob_is_clone(data->class_)) || !data->num)
 		return 0;
 
-	//better safe than sorry, current md->npc_event has a size of 50
-	if ((i=strlen(data->eventname)) >= 50)
-		return 0;
-
 	if (data->eventname[0])
 	{
 		if(npc_event_isspecial(data->eventname))
@@ -191,7 +187,7 @@ int mob_parse_dataset(struct spawn_data *data)
 					data->state.ai=1;
 				data->eventname[0] = '\0'; //Clear event as it is not used.
 			}
-		} else if( i ) {
+		} else if( ( i = strlen(data->eventname) ) > 0 ) {
 			if (data->eventname[i-1] == '"')
 				data->eventname[i-1] = '\0'; //Remove trailing quote.
 			if (data->eventname[0] == '"') //Strip leading quotes