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/gob | |
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/gob')
-rw-r--r-- | engines/gob/dataio.cpp | 2 | ||||
-rw-r--r-- | engines/gob/demos/demoplayer.cpp | 1 | ||||
-rw-r--r-- | engines/gob/map_v1.cpp | 2 | ||||
-rw-r--r-- | engines/gob/resources.cpp | 2 | ||||
-rw-r--r-- | engines/gob/save/saveconverter.cpp | 1 | ||||
-rw-r--r-- | engines/gob/save/saveconverter.h | 2 | ||||
-rw-r--r-- | engines/gob/save/savefile.cpp | 1 | ||||
-rw-r--r-- | engines/gob/sound/sounddesc.cpp | 2 |
8 files changed, 8 insertions, 5 deletions
diff --git a/engines/gob/dataio.cpp b/engines/gob/dataio.cpp index e409025fc3..b145441b4a 100644 --- a/engines/gob/dataio.cpp +++ b/engines/gob/dataio.cpp @@ -25,7 +25,7 @@ #include "common/endian.h" #include "common/types.h" -#include "common/stream.h" +#include "common/memstream.h" #include "gob/gob.h" #include "gob/dataio.h" diff --git a/engines/gob/demos/demoplayer.cpp b/engines/gob/demos/demoplayer.cpp index 011c524798..9013f600a5 100644 --- a/engines/gob/demos/demoplayer.cpp +++ b/engines/gob/demos/demoplayer.cpp @@ -25,6 +25,7 @@ #include "common/endian.h" #include "common/file.h" +#include "common/memstream.h" #include "gob/gob.h" #include "gob/demos/demoplayer.h" diff --git a/engines/gob/map_v1.cpp b/engines/gob/map_v1.cpp index 3df1cb8512..372f501887 100644 --- a/engines/gob/map_v1.cpp +++ b/engines/gob/map_v1.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stream.h" +#include "common/memstream.h" #include "gob/gob.h" #include "gob/map.h" diff --git a/engines/gob/resources.cpp b/engines/gob/resources.cpp index 9b0cc39215..56941aa4c1 100644 --- a/engines/gob/resources.cpp +++ b/engines/gob/resources.cpp @@ -25,7 +25,7 @@ #include "common/util.h" #include "common/endian.h" -#include "common/stream.h" +#include "common/memstream.h" #include "gob/gob.h" #include "gob/resources.h" diff --git a/engines/gob/save/saveconverter.cpp b/engines/gob/save/saveconverter.cpp index 7bfb2a2da2..59d313138b 100644 --- a/engines/gob/save/saveconverter.cpp +++ b/engines/gob/save/saveconverter.cpp @@ -24,6 +24,7 @@ */ #include "common/endian.h" +#include "common/memstream.h" #include "common/savefile.h" #include "gob/gob.h" diff --git a/engines/gob/save/saveconverter.h b/engines/gob/save/saveconverter.h index 3ae48e1edc..dd5f43875e 100644 --- a/engines/gob/save/saveconverter.h +++ b/engines/gob/save/saveconverter.h @@ -77,7 +77,7 @@ protected: Common::String _fileName; byte *_data; - Common::MemoryReadStream *_stream; + Common::SeekableReadStream *_stream; Common::InSaveFile *openSave() const; diff --git a/engines/gob/save/savefile.cpp b/engines/gob/save/savefile.cpp index 79e931fe30..3869ea2def 100644 --- a/engines/gob/save/savefile.cpp +++ b/engines/gob/save/savefile.cpp @@ -25,6 +25,7 @@ #include "common/util.h" #include "common/endian.h" +#include "common/memstream.h" #include "common/system.h" #include "common/savefile.h" diff --git a/engines/gob/sound/sounddesc.cpp b/engines/gob/sound/sounddesc.cpp index 2efb3e90f2..9df8bbb4bc 100644 --- a/engines/gob/sound/sounddesc.cpp +++ b/engines/gob/sound/sounddesc.cpp @@ -24,7 +24,7 @@ */ #include "common/util.h" -#include "common/stream.h" +#include "common/memstream.h" #include "sound/mixer.h" #include "sound/decoders/raw.h" #include "sound/decoders/wave.h" |