diff options
| author | Walter van Niftrik | 2016-08-28 20:54:06 +0200 |
|---|---|---|
| committer | Walter van Niftrik | 2016-08-28 21:01:12 +0200 |
| commit | a199672540388ad2017309be274f0e96993d903c (patch) | |
| tree | 49a8d58f0136030cd716c00c54e08f2f9267a370 | |
| parent | 1cfc4832bbc7898c5b7018fe779b2f4bb629f222 (diff) | |
| download | scummvm-rg350-a199672540388ad2017309be274f0e96993d903c.tar.gz scummvm-rg350-a199672540388ad2017309be274f0e96993d903c.tar.bz2 scummvm-rg350-a199672540388ad2017309be274f0e96993d903c.zip | |
ADL: Change some SeekableReadStream to ReadStream
| -rw-r--r-- | engines/adl/adl_v2.cpp | 10 | ||||
| -rw-r--r-- | engines/adl/adl_v2.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp index 4522591620..979d794146 100644 --- a/engines/adl/adl_v2.cpp +++ b/engines/adl/adl_v2.cpp @@ -364,7 +364,7 @@ DataBlockPtr AdlEngine_v2::readDataBlockPtr(Common::ReadStream &f) const { return _disk->getDataBlock(track, sector, offset, size); } -void AdlEngine_v2::loadItems(Common::SeekableReadStream &stream) { +void AdlEngine_v2::loadItems(Common::ReadStream &stream) { byte id; while ((id = stream.readByte()) != 0xff && !stream.eos() && !stream.err()) { Item item = Item(); @@ -395,7 +395,7 @@ void AdlEngine_v2::loadItems(Common::SeekableReadStream &stream) { error("Error loading items"); } -void AdlEngine_v2::loadRooms(Common::SeekableReadStream &stream, byte count) { +void AdlEngine_v2::loadRooms(Common::ReadStream &stream, byte count) { for (uint i = 0; i < count; ++i) { Room room; @@ -414,12 +414,12 @@ void AdlEngine_v2::loadRooms(Common::SeekableReadStream &stream, byte count) { error("Error loading rooms"); } -void AdlEngine_v2::loadMessages(Common::SeekableReadStream &stream, byte count) { +void AdlEngine_v2::loadMessages(Common::ReadStream &stream, byte count) { for (uint i = 0; i < count; ++i) _messages.push_back(readDataBlockPtr(stream)); } -void AdlEngine_v2::loadPictures(Common::SeekableReadStream &stream) { +void AdlEngine_v2::loadPictures(Common::ReadStream &stream) { byte picNr; while ((picNr = stream.readByte()) != 0xff) { if (stream.eos() || stream.err()) @@ -429,7 +429,7 @@ void AdlEngine_v2::loadPictures(Common::SeekableReadStream &stream) { } } -void AdlEngine_v2::loadItemPictures(Common::SeekableReadStream &stream, byte count) { +void AdlEngine_v2::loadItemPictures(Common::ReadStream &stream, byte count) { for (uint i = 0; i < count; ++i) { stream.readByte(); // number _itemPics.push_back(readDataBlockPtr(stream)); diff --git a/engines/adl/adl_v2.h b/engines/adl/adl_v2.h index 85c7544563..8f36b5cdb8 100644 --- a/engines/adl/adl_v2.h +++ b/engines/adl/adl_v2.h @@ -53,11 +53,11 @@ protected: virtual DataBlockPtr readDataBlockPtr(Common::ReadStream &f) const; virtual void adjustDataBlockPtr(byte &track, byte §or, byte &offset, byte &size) const { } - void loadItems(Common::SeekableReadStream &stream); - void loadRooms(Common::SeekableReadStream &stream, byte count); - void loadMessages(Common::SeekableReadStream &stream, byte count); - void loadPictures(Common::SeekableReadStream &stream); - void loadItemPictures(Common::SeekableReadStream &stream, byte count); + void loadItems(Common::ReadStream &stream); + void loadRooms(Common::ReadStream &stream, byte count); + void loadMessages(Common::ReadStream &stream, byte count); + void loadPictures(Common::ReadStream &stream); + void loadItemPictures(Common::ReadStream &stream, byte count); void checkTextOverflow(char c); |