diff options
| author | Max Horn | 2006-10-28 01:20:19 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-28 01:20:19 +0000 |
| commit | 9698d133a6b4559b7dbc1b1ec5cd8b6198e22466 (patch) | |
| tree | bd4c646c18c718fae17c40d3ac7d73bf911df72d /engines/scumm/smush/saud_channel.cpp | |
| parent | 3652229147389477fe72a530cfeab9130761b35e (diff) | |
| download | scummvm-rg350-9698d133a6b4559b7dbc1b1ec5cd8b6198e22466.tar.gz scummvm-rg350-9698d133a6b4559b7dbc1b1ec5cd8b6198e22466.tar.bz2 scummvm-rg350-9698d133a6b4559b7dbc1b1ec5cd8b6198e22466.zip | |
SCUMM: Changed class Chunk (and subclasses) to inherit from Common::SeekableReadStream
svn-id: r24544
Diffstat (limited to 'engines/scumm/smush/saud_channel.cpp')
| -rw-r--r-- | engines/scumm/smush/saud_channel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/smush/saud_channel.cpp b/engines/scumm/smush/saud_channel.cpp index 2c8893d57f..09d7034ea8 100644 --- a/engines/scumm/smush/saud_channel.cpp +++ b/engines/scumm/smush/saud_channel.cpp @@ -41,7 +41,7 @@ bool SaudChannel::isTerminated() const { } void SaudChannel::handleStrk(Chunk &b) { - int32 size = b.getSize(); + int32 size = b.size(); if (size != 14 && size != 10) { error("STRK has an invalid size : %d", size); } @@ -52,7 +52,7 @@ void SaudChannel::handleSmrk(Chunk &b) { } void SaudChannel::handleShdr(Chunk &b) { - int32 size = b.getSize(); + int32 size = b.size(); if (size != 4) error("SHDR has an invalid size : %d", size); } @@ -133,9 +133,9 @@ bool SaudChannel::checkParameters(int32 index, int32 nb, int32 flags, int32 volu bool SaudChannel::appendData(Chunk &b, int32 size) { if (_dataSize == -1) { assert(size > 8); - Chunk::type saud_type = b.getDword(); + Chunk::type saud_type = b.readUint32LE(); saud_type = SWAP_BYTES_32(saud_type); - uint32 saud_size = b.getDword(); + uint32 saud_size = b.readUint32LE(); saud_size = SWAP_BYTES_32(saud_size); if (saud_type != MKID_BE('SAUD')) error("Invalid Chunk for SaudChannel : %X", saud_type); |