Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14816 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei
2011-05-14 10:45:27 +00:00
parent 333c944cae
commit f34de92ef0
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@@ -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]

6
src/map/mob.c
View File

@@ -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