aboutsummaryrefslogtreecommitdiff
path: root/engines/composer/resource.cpp
diff options
context:
space:
mode:
authorupthorn2012-05-28 13:00:07 -0700
committerangstsmurf2016-10-18 02:09:35 +0200
commit3d6eb8b49d759d2bc6c1507fdc91b7f9e42303cf (patch)
tree82425be8944d6f03cde06303aa9e78951e8fd1c6 /engines/composer/resource.cpp
parentbbcf4a921842bdf6edd3d11741e7b32b82d47b70 (diff)
downloadscummvm-rg350-3d6eb8b49d759d2bc6c1507fdc91b7f9e42303cf.tar.gz
scummvm-rg350-3d6eb8b49d759d2bc6c1507fdc91b7f9e42303cf.tar.bz2
scummvm-rg350-3d6eb8b49d759d2bc6c1507fdc91b7f9e42303cf.zip
COMPOSER: cleaned up miscellaneous gcc warnings and formatting issues.
Diffstat (limited to 'engines/composer/resource.cpp')
-rw-r--r--engines/composer/resource.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp
index b433cd6c2a..063ee9cb14 100644
--- a/engines/composer/resource.cpp
+++ b/engines/composer/resource.cpp
@@ -263,7 +263,9 @@ Pipe::~Pipe() {
void Pipe::nextFrame() {
if (_offset == (uint)_stream->size())
return;
+#ifdef SAVING_ANYWHERE
_bufferedResources.push_back(_currBufferedResources);
+#endif
_currBufferedResources.clear();
_stream->seek(_offset, SEEK_SET);
@@ -319,7 +321,9 @@ 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
_currBufferedResources[tag].push_back(id);
+#endif
}
return stream;
}
@@ -339,7 +343,9 @@ Common::SeekableReadStream *Pipe::getResource(uint32 tag, uint16 id, bool buffer
}
if (buffering) {
_types[tag].erase(id);
+#ifdef SAVING_ANYWHERE
_currBufferedResources[tag].push_back(id);
+#endif
}
return new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES);
}