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/scumm/he | |
| 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/scumm/he')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 1 | ||||
| -rw-r--r-- | engines/scumm/he/resource_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/resource_he.h | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index 87afe5fd90..fedbdbf377 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -26,6 +26,7 @@ #ifdef ENABLE_HE #include "common/system.h" +#include "common/memstream.h" #include "sound/audiostream.h" #include "sound/mixer.h" #include "sound/decoders/raw.h" diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index f7a7d3a567..70663b1b33 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -832,7 +832,7 @@ int Win32ResExtractor::convertIcons(byte *data, int datasize, byte **cursor, int uint32 c, d; int completed; int matched = 0; - MemoryReadStream *in = new MemoryReadStream(data, datasize); + Common::MemoryReadStream *in = new Common::MemoryReadStream(data, datasize); if (!in->read(&dir, sizeof(Win32CursorIconFileDir)- sizeof(Win32CursorIconFileDirEntry))) goto cleanup; diff --git a/engines/scumm/he/resource_he.h b/engines/scumm/he/resource_he.h index 65190ea41c..b3f3479406 100644 --- a/engines/scumm/he/resource_he.h +++ b/engines/scumm/he/resource_he.h @@ -147,9 +147,6 @@ public: bool _arg_raw; Common::String _fileName; CachedCursor _cursorCache[MAX_CACHED_CURSORS]; - - typedef Common::MemoryReadStream MemoryReadStream; - }; class Win32ResExtractor : public ResExtractor { |