diff options
author | upthorn | 2012-06-12 15:19:25 -0700 |
---|---|---|
committer | angstsmurf | 2016-10-18 02:10:11 +0200 |
commit | c4c6cce78ea67f26b1c2017ebb15f00612c4d41b (patch) | |
tree | 7df5f90455635f46ea50839b56b0966fe7d4bfa6 /engines/composer/resource.cpp | |
parent | 027bab88fba3187c2fcf2211d0aba5f6cec09a6c (diff) | |
download | scummvm-rg350-c4c6cce78ea67f26b1c2017ebb15f00612c4d41b.tar.gz scummvm-rg350-c4c6cce78ea67f26b1c2017ebb15f00612c4d41b.tar.bz2 scummvm-rg350-c4c6cce78ea67f26b1c2017ebb15f00612c4d41b.zip |
COMPOSER: Completely removed unnecessary #ifdefs
Diffstat (limited to 'engines/composer/resource.cpp')
-rw-r--r-- | engines/composer/resource.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp index 8192da936b..fa1811c05a 100644 --- a/engines/composer/resource.cpp +++ b/engines/composer/resource.cpp @@ -252,9 +252,7 @@ Pipe::Pipe(Common::SeekableReadStream *stream, uint16 id) { _offset = 0; _stream = stream; _anim = NULL; -#ifdef SAVING_ANYWHERE _pipeId = id; -#endif } Pipe::~Pipe() { @@ -317,13 +315,11 @@ Common::SeekableReadStream *Pipe::getResource(uint32 tag, uint16 id, bool buffer res.entries[0].offset, res.entries[0].offset + res.entries[0].size); if (buffering) { _types[tag].erase(id); -#ifdef SAVING_ANYWHERE bool found = false; for (Common::List<uint16>::const_iterator i = _bufferedResources[tag].begin(); !found && (i != _bufferedResources[tag].end()); i++) if ((*i) == id) found = true; if (!found) _bufferedResources[tag].push_back(id); -#endif } return stream; } @@ -343,13 +339,11 @@ Common::SeekableReadStream *Pipe::getResource(uint32 tag, uint16 id, bool buffer } if (buffering) { _types[tag].erase(id); -#ifdef SAVING_ANYWHERE bool found = false; for (Common::List<uint16>::const_iterator i = _bufferedResources[tag].begin(); !found && (i != _bufferedResources[tag].end()); i++) if ((*i) == id) found = true; if (!found) _bufferedResources[tag].push_back(id); -#endif } return new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES); } |