diff options
author | Max Horn | 2004-06-27 21:30:33 +0000 |
---|---|---|
committer | Max Horn | 2004-06-27 21:30:33 +0000 |
commit | a1b82d8e13ca41834c494839c2a05ae7638a38c3 (patch) | |
tree | fb4b281fd195265035cbb1751dbdcc71b9216f8e /saga/sndres.cpp | |
parent | 4b2d86392473184211a41e2fdc8a5d8188a4e636 (diff) | |
download | scummvm-rg350-a1b82d8e13ca41834c494839c2a05ae7638a38c3.tar.gz scummvm-rg350-a1b82d8e13ca41834c494839c2a05ae7638a38c3.tar.bz2 scummvm-rg350-a1b82d8e13ca41834c494839c2a05ae7638a38c3.zip |
Cleanup for MemoryReadStream; made it match the File-class interface
svn-id: r14086
Diffstat (limited to 'saga/sndres.cpp')
-rw-r--r-- | saga/sndres.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/saga/sndres.cpp b/saga/sndres.cpp index 418c39c550..f7aca3be32 100644 --- a/saga/sndres.cpp +++ b/saga/sndres.cpp @@ -157,16 +157,16 @@ int SndRes::loadVocSound(byte *snd_res, size_t snd_res_len, R_SOUNDBUFFER *snd_b voc_hb.voc_version = readS->readUint16LE(); voc_hb.voc_fileid = readS->readUint16LE(); - if ((int32)(snd_res_len - readS->tell()) < (int32)(voc_hb.db_offset + R_VOC_GENBLOCK_LEN)) { + if ((int32)(snd_res_len - readS->pos()) < (int32)(voc_hb.db_offset + R_VOC_GENBLOCK_LEN)) { return R_FAILURE; } - while (readS->tell() < voc_hb.db_offset) + while (readS->pos() < voc_hb.db_offset) readS->readByte(); for (;;) { /* Read generic block header */ - if (snd_res_len - readS->tell() < R_VOC_GENBLOCK_LEN) { + if (snd_res_len - readS->pos() < R_VOC_GENBLOCK_LEN) { return R_FAILURE; } @@ -197,8 +197,8 @@ int SndRes::loadVocSound(byte *snd_res, size_t snd_res_len, R_SOUNDBUFFER *snd_b snd_buf_i->res_data = snd_res; snd_buf_i->res_len = snd_res_len; - snd_buf_i->s_buf = snd_res + readS->tell(); - snd_buf_i->s_buf_len = snd_res_len - readS->tell() - 1; /* -1 for end block */ + snd_buf_i->s_buf = snd_res + readS->pos(); + snd_buf_i->s_buf_len = snd_res_len - readS->pos() - 1; /* -1 for end block */ snd_buf_i->s_signed = 0; return R_SUCCESS; |