diff options
| author | Max Horn | 2010-11-19 17:03:07 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-19 17:03:07 +0000 |
| commit | 2180b2d6b534d3786f89d02fe508c60c68b7ff89 (patch) | |
| tree | ac7af0e5f5049537f4c81c401d5685bebbb47068 /engines/cine | |
| parent | 111384473bb65741f7f2b945e1c00e6aeccc805c (diff) | |
| download | scummvm-rg350-2180b2d6b534d3786f89d02fe508c60c68b7ff89.tar.gz scummvm-rg350-2180b2d6b534d3786f89d02fe508c60c68b7ff89.tar.bz2 scummvm-rg350-2180b2d6b534d3786f89d02fe508c60c68b7ff89.zip | |
COMMON: Split common/stream.h into several headers
svn-id: r54385
Diffstat (limited to 'engines/cine')
| -rw-r--r-- | engines/cine/anim.cpp | 4 | ||||
| -rw-r--r-- | engines/cine/bg.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/object.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/saveload.cpp | 2 | ||||
| -rw-r--r-- | engines/cine/sound.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index 747c9221ee..14b8de9e39 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -28,7 +28,7 @@ */ #include "common/endian.h" -#include "common/stream.h" +#include "common/memstream.h" #include "cine/cine.h" #include "cine/anim.h" @@ -485,7 +485,7 @@ void convert4BBP(byte *dest, const byte *source, int16 width, int16 height) { * @param[out] animHeader Image header reference * @param readS Input stream open for reading */ -void loadAnimHeader(AnimHeaderStruct &animHeader, Common::MemoryReadStream readS) { +void loadAnimHeader(AnimHeaderStruct &animHeader, Common::SeekableReadStream &readS) { animHeader.field_0 = readS.readByte(); animHeader.field_1 = readS.readByte(); animHeader.field_2 = readS.readByte(); diff --git a/engines/cine/bg.cpp b/engines/cine/bg.cpp index 08722c42e5..449e254021 100644 --- a/engines/cine/bg.cpp +++ b/engines/cine/bg.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" -#include "common/stream.h" +#include "common/memstream.h" #include "cine/cine.h" #include "cine/various.h" diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index 82dc0a6ef1..2b456ad49d 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" -#include "common/scummsys.h" +#include "common/memstream.h" #include "common/util.h" #include "cine/cine.h" diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index 0f7c50b7e5..fd426be66a 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -801,7 +801,7 @@ bool CineEngine::makeLoad(char *saveName) { // Hopefully devices with more limited memory can also cope with this memory allocation. saveSize = 256 * 1024; } - Common::SharedPtr<Common::MemoryReadStream> in(saveFile->readStream(saveSize)); + Common::SharedPtr<Common::SeekableReadStream> in(saveFile->readStream(saveSize)); // Try to detect the used savegame format enum CineSaveGameFormat saveGameFormat = detectSaveGameFormat(*in); diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index dd4b4d4ab4..7ba084128b 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" #include "common/file.h" -#include "common/system.h" +#include "common/memstream.h" #include "cine/cine.h" #include "cine/sound.h" |