From 9698d133a6b4559b7dbc1b1ec5cd8b6198e22466 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 28 Oct 2006 01:20:19 +0000 Subject: SCUMM: Changed class Chunk (and subclasses) to inherit from Common::SeekableReadStream svn-id: r24544 --- engines/scumm/smush/saud_channel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/scumm/smush/saud_channel.cpp') 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); -- cgit v1.2.3