forked from len0rd/rockbox
Made the sokoban level loader CR/LF tolerant
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3758 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
29f62ebf84
commit
c8fb78fd44
1 changed files with 3 additions and 3 deletions
|
@ -329,7 +329,7 @@ static int get_level(char *level, int level_size)
|
||||||
/* we search for the first character that isn't a newline */
|
/* we search for the first character that isn't a newline */
|
||||||
for (i = 0; i < nread; i++) {
|
for (i = 0; i < nread; i++) {
|
||||||
/* skip and count all newlines */
|
/* skip and count all newlines */
|
||||||
while((buffer[i] == '\n') && (i < nread)) {
|
while((buffer[i] == '\n' || buffer[i] == '\r') && (i < nread)) {
|
||||||
prevnewl++;
|
prevnewl++;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
@ -339,7 +339,7 @@ static int get_level(char *level, int level_size)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* start of new level? */
|
/* start of new level? */
|
||||||
if((prevnewl>1) && (buffer[i] != '\n')) {
|
if((prevnewl>1) && (buffer[i] != '\n' && buffer[i] != '\r')) {
|
||||||
prevnewl=0; /* none now */
|
prevnewl=0; /* none now */
|
||||||
level_ct++;
|
level_ct++;
|
||||||
|
|
||||||
|
@ -351,7 +351,7 @@ static int get_level(char *level, int level_size)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* skip all non-newlines */
|
/* skip all non-newlines */
|
||||||
while((buffer[i] != '\n') && (i < nread))
|
while((buffer[i] != '\n' && buffer[i] != '\r') && (i < nread))
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
if(!level_found)
|
if(!level_found)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue