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

* Merged changes up to eAthena 15049.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15264 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
eathenabot 2011-12-25 10:14:42 +00:00
parent f8c4e952a3
commit 47013253bd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/grfio.c
View File

@ -672,7 +672,7 @@ static bool grfio_parse_restable_row(const char* row)
char local[256];
FILELIST* entry;
if( sscanf(row, "%[^#]#%[^#]#", w1, w2) != 2 )
if( sscanf(row, "%[^#\r\n]#%[^#\r\n]#", w1, w2) != 2 )
return false;
if( strstr(w2, ".gat") == NULL && strstr(w2, ".rsw") == NULL )

7
src/map/unit.c
View File

@ -725,11 +725,10 @@ int unit_blown(struct block_list* bl, int dx, int dy, int count, int flag)
}
}
}
else
{// could not knockback
count = 0;
}
count = distance(dx, dy);
}
return count; // return amount of knocked back cells
}