diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-25 10:14:42 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-25 10:14:42 +0000 |
| commit | 46733d74c81b5fccdb1e557cbceb8e977e876e47 (patch) | |
| tree | ba0edb8eb7516f9ddbc4e1e706789989bf955214 | |
| parent | 1d8592b23ce221f543fb9978c88620f70280c885 (diff) | |
| download | hercules-46733d74c81b5fccdb1e557cbceb8e977e876e47.tar.gz hercules-46733d74c81b5fccdb1e557cbceb8e977e876e47.tar.bz2 hercules-46733d74c81b5fccdb1e557cbceb8e977e876e47.tar.xz hercules-46733d74c81b5fccdb1e557cbceb8e977e876e47.zip | |
* Merged changes up to eAthena 15049.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15264 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/common/grfio.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c index e10a71a32..57e942892 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -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 ) diff --git a/src/map/unit.c b/src/map/unit.c index c76e9dc23..272fc9242 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -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 } |