* Merged changes up to eAthena 15049.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15264 54d463be-8e91-2dee-dedb-b68131a5f0ec

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 )

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
 }