aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/smush/chunk.cpp
diff options
context:
space:
mode:
authorMax Horn2006-10-28 01:28:41 +0000
committerMax Horn2006-10-28 01:28:41 +0000
commit10478617c699ad1e6fa272c5609cc743efd98fab (patch)
treeb177dd3393a4d7924d11b58fdcb91c865a2f763f /engines/scumm/smush/chunk.cpp
parenta3bc66bcbd15fa6532b6f502cde42e06fbbb1a6a (diff)
downloadscummvm-rg350-10478617c699ad1e6fa272c5609cc743efd98fab.tar.gz
scummvm-rg350-10478617c699ad1e6fa272c5609cc743efd98fab.tar.bz2
scummvm-rg350-10478617c699ad1e6fa272c5609cc743efd98fab.zip
SCUMM: Take advantage of the fact that Chunk now is a ReadStream subclass
svn-id: r24546
Diffstat (limited to 'engines/scumm/smush/chunk.cpp')
-rw-r--r--engines/scumm/smush/chunk.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp
index 72d14c9776..a0b5fb86e4 100644
--- a/engines/scumm/smush/chunk.cpp
+++ b/engines/scumm/smush/chunk.cpp
@@ -62,15 +62,15 @@ void BaseChunk::seek(int32 delta, int dir) {
case SEEK_SET:
if (delta < 0)
error("invalid seek request");
-
_curPos = (uint32)delta;
break;
case SEEK_END:
if (delta > 0 || _size < (uint32)-delta)
error("invalid seek request");
-
_curPos = (uint32)(_size + delta);
break;
+ default:
+ break;
}
if (_curPos > _size) {
@@ -116,7 +116,7 @@ FileChunk::~FileChunk() {
Chunk *FileChunk::subBlock() {
FileChunk *ptr = new FileChunk(_data, _offset + _curPos);
- seek(sizeof(Chunk::type) + sizeof(uint32) + ptr->size(), SEEK_CUR);
+ skip(sizeof(Chunk::type) + sizeof(uint32) + ptr->size());
return ptr;
}
@@ -146,7 +146,7 @@ MemoryChunk::MemoryChunk(byte *data) {
Chunk *MemoryChunk::subBlock() {
MemoryChunk *ptr = new MemoryChunk(_data + _curPos);
- seek(sizeof(Chunk::type) + sizeof(uint32) + ptr->size(), SEEK_CUR);
+ skip(sizeof(Chunk::type) + sizeof(uint32) + ptr->size());
return ptr;
}