diff options
| author | Willem Jan Palenstijn | 2008-09-14 22:28:53 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2008-09-14 22:28:53 +0000 |
| commit | c8eeae8d4dffa5849a23cf963884027a7789504b (patch) | |
| tree | 1f2a0de23851cb7e7d1d77114c8379aa27f4fb85 /engines/drascula/drascula.cpp | |
| parent | fbfe30bf861af9b83325e0c7fecd4b0a68da5af9 (diff) | |
| download | scummvm-rg350-c8eeae8d4dffa5849a23cf963884027a7789504b.tar.gz scummvm-rg350-c8eeae8d4dffa5849a23cf963884027a7789504b.tar.bz2 scummvm-rg350-c8eeae8d4dffa5849a23cf963884027a7789504b.zip | |
Big patch changing semantics of ReadStream::eos():
eos() now only returns true _after_ trying to read past the end of the stream.
This has a large potential for regressions. Please test!
svn-id: r34549
Diffstat (limited to 'engines/drascula/drascula.cpp')
| -rw-r--r-- | engines/drascula/drascula.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index af32a0c2e5..34f3701f31 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -598,8 +598,10 @@ char *DrasculaEngine::getLine(char *buf, int len) { for (;;) { b = buf; - while (!_arj.eos()) { + while (true) { c = ~_arj.readByte(); + if (_arj.eos()) break; + if (c == '\r') continue; if (c == '\n' || b - buf >= (len - 1)) |